diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
| commit | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (patch) | |
| tree | a5d2a80f121a5c854773ddc85b1d9cbd6b840861 /lib | |
| parent | Merge branch 'sh/clkfwk' into sh-latest (diff) | |
| parent | sh: pfc: Verify pin type encoding size at build time. (diff) | |
| download | linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.tar.gz linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.zip | |
Merge branch 'common/pfc' into sh-latest
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 20 | ||||
| -rw-r--r-- | lib/spinlock_debug.c | 2 |
2 files changed, 21 insertions, 1 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 diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index d0ec4f3d1593..e91fbc23fff1 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c @@ -118,7 +118,7 @@ static void __spin_lock_debug(raw_spinlock_t *lock) /* lockup suspected: */ if (print_once) { print_once = 0; - spin_dump(lock, "lockup"); + spin_dump(lock, "lockup suspected"); #ifdef CONFIG_SMP trigger_all_cpu_backtrace(); #endif |