commit b1dc1b9de2e6ee98638bcc7af83e5a171199b2f3
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Feb 06 14:05:57 2018 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Feb 06 14:05:57 2018 -0800
tree abecb56847889a3ab2134efbbd6cf4c86ed5c5fd
parent 9e754c885fd7411a272e679bf555e55d83eda8b4
parent 888271aa2f01ba695f00ec6fc0b6f7b309e73be5

Merge "msm: defconfig: Enable panic on softlockup"

arch/arm/configs/msm8953_defconfig

diff --git a/arch/arm/configs/msm8953_defconfig b/arch/arm/configs/msm8953_defconfig
index 03f297f..155a353 100644
--- a/arch/arm/configs/msm8953_defconfig
+++ b/arch/arm/configs/msm8953_defconfig
@@ -491,6 +491,7 @@
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_WQ_WATCHDOG=y
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_PANIC_ON_SCHED_BUG=y

arch/arm64/configs/msm8953_defconfig

diff --git a/arch/arm64/configs/msm8953_defconfig b/arch/arm64/configs/msm8953_defconfig
index ed222d2..eb7d54d 100644
--- a/arch/arm64/configs/msm8953_defconfig
+++ b/arch/arm64/configs/msm8953_defconfig
@@ -567,6 +567,7 @@
 CONFIG_DEBUG_STACK_USAGE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 CONFIG_WQ_WATCHDOG=y
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_PANIC_ON_SCHED_BUG=y