summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2012-04-11 14:15:29 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-07 14:45:29 +0200
commit2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f (patch)
tree1690ae9e0a0a1335eb9d1e22e84a5c43069f3f02
parentIA32 emulation: Fix build problem for modular ia32 a.out support (diff)
downloadlinux-2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f.tar.xz
linux-2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f.zip
panic: Make panic_on_oops configurable
Several distros set this by default by patching panic_on_oops. It seems to fit with the BOOTPARAM_{HARD,SOFT}_PANIC options though, so let's add a Kconfig entry and reduce some more upstream delta. Signed-off-by: Kyle McMartin <kyle@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20120411121529.GH26688@redacted.bos.redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/panic.c2
-rw-r--r--lib/Kconfig.debug20
2 files changed, 21 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 8ed89a175d79..b6215b7ce99d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -27,7 +27,7 @@
#define PANIC_TIMER_STEP 100
#define PANIC_BLINK_SPD 18
-int panic_on_oops;
+int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
static unsigned long tainted_mask;
static int pause_on_oops;
static int pause_on_oops_flag;
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 6777153f18f3..91858cd8394f 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -228,6 +228,26 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
+config PANIC_ON_OOPS
+ bool "Panic on Oops" if EXPERT
+ default n
+ 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
+ line.
+
+ This feature is useful to ensure that the kernel does not do
+ anything erroneous after an oops which could result in data
+ corruption or other issues.
+
+ Say N if unsure.
+
+config PANIC_ON_OOPS_VALUE
+ int
+ range 0 1
+ default 0 if !PANIC_ON_OOPS
+ default 1 if PANIC_ON_OOPS
+
config DETECT_HUNG_TASK
bool "Detect Hung Tasks"
depends on DEBUG_KERNEL