[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f@git.kernel.org>
Date: Mon, 7 May 2012 21:19:05 -0700
From: tip-bot for Kyle McMartin <kmcmarti@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
a.p.zijlstra@...llo.nl, torvalds@...ux-foundation.org,
kmcmarti@...hat.com, kyle@...hat.com, akpm@...ux-foundation.org,
tglx@...utronix.de
Subject: [tip:core/debug] panic: Make panic_on_oops configurable
Commit-ID: 2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f
Gitweb: http://git.kernel.org/tip/2a01bb3885c9145dbb7583d5aa5f5d5504f6f46f
Author: Kyle McMartin <kmcmarti@...hat.com>
AuthorDate: Wed, 11 Apr 2012 08:15:29 -0400
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 7 May 2012 14:45:29 +0200
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@...hat.com>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/20120411121529.GH26688@redacted.bos.redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/panic.c | 2 +-
lib/Kconfig.debug | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 8ed89a1..b6215b7 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 6777153..91858cd 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists