diff options
| author | Jean Huang <jeanh@nvidia.com> | 2013-06-14 13:42:17 -0700 |
|---|---|---|
| committer | Matt Wagner <mwagner@nvidia.com> | 2013-06-18 09:45:30 -0700 |
| commit | 29c8d40d455aef9310a5d4154f82f73644de15f6 (patch) | |
| tree | e8725897730bf1534cb1f43457642b9e14474b3b | |
| parent | be97c59c55b9bf547cf0030a7dc469319bd8de94 (diff) | |
ARM: tegra: config: set panic timeout 5 secs
Change-Id: I342d1f1505caedabaefa0b2f0eb5dccdf5046bca
Signed-off-by: Jean Huang <jeanh@nvidia.com>
Reviewed-on: http://git-master/r/239022
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Tao Xie <txie@nvidia.com>
Reviewed-by: Matt Wagner <mwagner@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra11_android_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra11_android_defconfig b/arch/arm/configs/tegra11_android_defconfig index 248fa6463b7f..2d49bd47cd57 100644 --- a/arch/arm/configs/tegra11_android_defconfig +++ b/arch/arm/configs/tegra11_android_defconfig @@ -9,6 +9,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y +CONFIG_PANIC_TIMEOUT=5 # CONFIG_ELF_CORE is not set CONFIG_EMBEDDED=y CONFIG_SLAB=y @@ -537,6 +538,8 @@ CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_LOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y # CONFIG_DETECT_HUNG_TASK is not set CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y |