summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/powernv_defconfig
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2017-08-09 12:57:55 +0200
committerMichael Ellerman <mpe@ellerman.id.au>2017-08-09 15:45:13 +0200
commit7310d5c8c55e8987a854507f71022f8de676bbf4 (patch)
treedd292f6371da95609194091996d8fad24c88dc0f /arch/powerpc/configs/powernv_defconfig
parentpowerpc/powernv/idle: Disable LOSE_FULL_CONTEXT states when stop-api fails (diff)
downloadlinux-7310d5c8c55e8987a854507f71022f8de676bbf4.tar.xz
linux-7310d5c8c55e8987a854507f71022f8de676bbf4.zip
powerpc/configs: Re-enable HARD/SOFT lockup detectors
In commit 05a4a9527931 ("kernel/watchdog: split up config options"), CONFIG_LOCKUP_DETECTOR was split into two separate config options, CONFIG_HARDLOCKUP_DETECTOR and CONFIG_SOFTLOCKUP_DETECTOR. Our defconfigs still have CONFIG_LOCKUP_DETECTOR=y, but that is no longer user selectable, and we don't mention the new options, so we end up with none of them enabled. So update the defconfigs to turn on the new SOFT and HARD options, the end result being the same as what we had previously. Fixes: 05a4a9527931 ("kernel/watchdog: split up config options") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/powernv_defconfig')
-rw-r--r--arch/powerpc/configs/powernv_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig
index 0695ce047d56..34fc9bbfca9e 100644
--- a/arch/powerpc/configs/powernv_defconfig
+++ b/arch/powerpc/configs/powernv_defconfig
@@ -293,7 +293,8 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_STACK_USAGE=y
CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
CONFIG_LATENCYTOP=y
CONFIG_SCHED_TRACER=y
CONFIG_BLK_DEV_IO_TRACE=y