summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Hu <taoh@nvidia.com>2014-02-25 18:09:35 +0800
committerHarry Hong <hhong@nvidia.com>2014-03-12 17:48:21 -0700
commitaf6d768ff8df29a608886fcc22d5e697e753410d (patch)
tree536e49bdb1369a083f8c876ea30f976c2dd6670c
parent1da62bf1062d08c46593a43444f598a187db5ac3 (diff)
kernel:reset system when softlockup happens
Bug 1464185 Change-Id: I80830cbafbca43161bc6e1c4e9cdd9e599e551e5 Signed-off-by: Tao Hu <taoh@nvidia.com> Reviewed-on: http://git-master/r/374118 Reviewed-by: David Yu (Engrg-SW) <davyu@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_tegranote7c_android_defconfig1
-rw-r--r--arch/arm/configs/tegra_tegratab_android_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_tegranote7c_android_defconfig b/arch/arm/configs/tegra_tegranote7c_android_defconfig
index 8ecf2c30bd6d..991bac1cb050 100644
--- a/arch/arm/configs/tegra_tegranote7c_android_defconfig
+++ b/arch/arm/configs/tegra_tegranote7c_android_defconfig
@@ -561,6 +561,7 @@ CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_SECTION_MISMATCH=y
CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
diff --git a/arch/arm/configs/tegra_tegratab_android_defconfig b/arch/arm/configs/tegra_tegratab_android_defconfig
index 86c7d13b7577..0177d50ce830 100644
--- a/arch/arm/configs/tegra_tegratab_android_defconfig
+++ b/arch/arm/configs/tegra_tegratab_android_defconfig
@@ -560,6 +560,7 @@ CONFIG_PRINTK_TIME=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_SECTION_MISMATCH=y
CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
# CONFIG_DETECT_HUNG_TASK is not set
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y