summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-06-06 11:12:55 +0200
committerIngo Molnar <mingo@kernel.org>2012-06-06 11:12:55 +0200
commitc7f5f4ab10ce4e05b9f8877f1fd112faba71f175 (patch)
treef4e09bf621f0201283167f17f2b33461042cc1a7 /lib
parenteea5b5510fc5545d15b69da8e485a7424ae388cf (diff)
parent62be73eafaa045d3233337303fb140f7f8a61135 (diff)
downloadlinux-stable-c7f5f4ab10ce4e05b9f8877f1fd112faba71f175.tar.gz
linux-stable-c7f5f4ab10ce4e05b9f8877f1fd112faba71f175.tar.bz2
linux-stable-c7f5f4ab10ce4e05b9f8877f1fd112faba71f175.zip
Merge branch 'core/debug' into core/urgent
Merge two debugging patchlets that were waiting for preparatory commits to hit upstream. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug20
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a42d3ae39648..ff5bdee4716d 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -241,6 +241,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