diff options
| author | Jean Huang <jeanh@nvidia.com> | 2013-06-14 13:42:17 -0700 |
|---|---|---|
| committer | Harshada Kale <hkale@nvidia.com> | 2013-07-26 01:41:30 -0700 |
| commit | 86e9dc464f0b4e47483c68532aa6a344dc9ce5c9 (patch) | |
| tree | dd3d17d5652a0bf9545ed8e05cf3e89afeed7bff /arch | |
| parent | 9e6bb042d649c77b4eeec43c471a8d0f51f61baa (diff) | |
ARM: tegra: config: set panic timeout 5 secs
Change-Id: I342d1f1505caedabaefa0b2f0eb5dccdf5046bca
Signed-off-by: Jean Huang <jeanh@nvidia.com>
(cherry picked from commit 7b01f4f1251efc02b2688c60fec162462f9c3aae)
Reviewed-on: http://git-master/r/246201
Reviewed-by: Harshada Kale <hkale@nvidia.com>
Tested-by: Harshada Kale <hkale@nvidia.com>
Diffstat (limited to 'arch')
| -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 41790337c3d2..403e55d15370 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 @@ -540,6 +541,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 |