Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index bb8d9b136cf9d2ed67b61dfda299410694f36b24..e4a7f808fa0630b31f5d7ba466e280a5bbb3c217 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -243,8 +243,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
        default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
 
 config PANIC_ON_OOPS
-       bool "Panic on Oops" if EXPERT
-       default n
+       bool "Panic on Oops"
        help
          Say Y here to enable the kernel to panic when it oopses. This
          has the same effect as setting oops=panic on the kernel command