summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-23 12:54:08 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-23 12:54:08 -0800
commit82b5ff09ae65e6d598f7557ad0a5981ea32e9653 (patch)
treedf0c217b1ca6baa582e0aa93177f694c53d66f93
parent21513402687d0dd10226f5983217d38979aa2b48 (diff)
parent9e36db9f5af21c86500896a9427871f0e9ed40d7 (diff)
Merge "defconfig: msm: Remove LOCKUP detector in sdm660 perf config"
-rw-r--r--arch/arm/configs/sdm660-perf_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/sdm660-perf_defconfig b/arch/arm/configs/sdm660-perf_defconfig
index a2584f6831e2..724cbc77d1a0 100644
--- a/arch/arm/configs/sdm660-perf_defconfig
+++ b/arch/arm/configs/sdm660-perf_defconfig
@@ -582,8 +582,6 @@ CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_INFO=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_PAGE_EXTENSION=y
-CONFIG_LOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
CONFIG_PANIC_TIMEOUT=5
# CONFIG_SCHED_DEBUG is not set
CONFIG_PANIC_ON_SCHED_BUG=y