aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/configs/powernv_defconfig
diff options
context:
space:
mode:
authorGravatar David S. Miller <davem@davemloft.net> 2017-08-15 20:23:23 -0700
committerGravatar David S. Miller <davem@davemloft.net> 2017-08-15 20:23:23 -0700
commit463910e2dff580e4e9a678af710b4818b5189691 (patch)
tree21b4e53cdbec7e5a537ddfc1598fbf17deae57e2 /arch/powerpc/configs/powernv_defconfig
parentdt-bindings: net: ravb : Add support for r8a7745 SoC (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-463910e2dff580e4e9a678af710b4818b5189691.tar.gz
linux-463910e2dff580e4e9a678af710b4818b5189691.tar.bz2
linux-463910e2dff580e4e9a678af710b4818b5189691.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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