From 86e9dc464f0b4e47483c68532aa6a344dc9ce5c9 Mon Sep 17 00:00:00 2001 From: Jean Huang Date: Fri, 14 Jun 2013 13:42:17 -0700 Subject: ARM: tegra: config: set panic timeout 5 secs Change-Id: I342d1f1505caedabaefa0b2f0eb5dccdf5046bca Signed-off-by: Jean Huang (cherry picked from commit 7b01f4f1251efc02b2688c60fec162462f9c3aae) Reviewed-on: http://git-master/r/246201 Reviewed-by: Harshada Kale Tested-by: Harshada Kale --- arch/arm/configs/tegra11_android_defconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch') 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 -- cgit v1.2.3