Skip to content

Commit 2a01bb3

Browse files
jkkmIngo Molnar
authored andcommitted
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>
1 parent febb72a commit 2a01bb3

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

kernel/panic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define PANIC_TIMER_STEP 100
2828
#define PANIC_BLINK_SPD 18
2929

30-
int panic_on_oops;
30+
int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;
3131
static unsigned long tainted_mask;
3232
static int pause_on_oops;
3333
static int pause_on_oops_flag;

lib/Kconfig.debug

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,26 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
228228
default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
229229
default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
230230

231+
config PANIC_ON_OOPS
232+
bool "Panic on Oops" if EXPERT
233+
default n
234+
help
235+
Say Y here to enable the kernel to panic when it oopses. This
236+
has the same effect as setting oops=panic on the kernel command
237+
line.
238+
239+
This feature is useful to ensure that the kernel does not do
240+
anything erroneous after an oops which could result in data
241+
corruption or other issues.
242+
243+
Say N if unsure.
244+
245+
config PANIC_ON_OOPS_VALUE
246+
int
247+
range 0 1
248+
default 0 if !PANIC_ON_OOPS
249+
default 1 if PANIC_ON_OOPS
250+
231251
config DETECT_HUNG_TASK
232252
bool "Detect Hung Tasks"
233253
depends on DEBUG_KERNEL

0 commit comments

Comments
 (0)