summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-07-05 13:32:40 +1000
committerIngo Molnar <mingo@elte.hu>2011-07-05 13:00:23 +0200
commit8edbb83e5bc3c7d5d76861fc61872105288d2610 (patch)
tree4c841e91fe14f134de789d08e33c3463614ac161
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
downloadtalos-obmc-linux-8edbb83e5bc3c7d5d76861fc61872105288d2610.tar.gz
talos-obmc-linux-8edbb83e5bc3c7d5d76861fc61872105288d2610.zip
lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
Replace CONFIG_DETECT_SOFTLOCKUP with CONFIG_LOCKUP_DETECTOR. Signed-off-by: Anton Blanchard <anton@samba.org> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Cc: fweisbec@gmail.com Cc: a.p.zijlstra@chello.nl Link: http://lkml.kernel.org/r/20110705133240.25e81a7a@kryten Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--lib/Kconfig.debug4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index dd373c8ee943..9c28fa4202f8 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -227,7 +227,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
config DETECT_HUNG_TASK
bool "Detect Hung Tasks"
depends on DEBUG_KERNEL
- default DETECT_SOFTLOCKUP
+ default LOCKUP_DETECTOR
help
Say Y here to enable the kernel to detect "hung tasks",
which are bugs that cause the task to be stuck in
@@ -866,7 +866,7 @@ config BOOT_PRINTK_DELAY
system, and then set "lpj=M" before setting "boot_delay=N".
NOTE: Using this option may adversely affect SMP systems.
I.e., processors other than the first one may not boot up.
- BOOT_PRINTK_DELAY also may cause DETECT_SOFTLOCKUP to detect
+ BOOT_PRINTK_DELAY also may cause LOCKUP_DETECTOR to detect
what it believes to be lockup conditions.
config RCU_TORTURE_TEST
OpenPOWER on IntegriCloud