diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:09:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-24 16:09:47 +1000 |
| commit | 6ad609d8e30d2fcaa0236ed3617437b10f7a8ae1 (patch) | |
| tree | 7b19733e64e5e0b99002b13a9fdf85936fb1a44a /lib | |
| parent | 93b90900b70a7f6ea9cda5999dd8e4f1539b8f4e (diff) | |
| parent | bd662bb5113d65b9a9e920316c09a49d30537418 (diff) | |
Merge commit 'sched-latest/latest'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 26 | ||||
| -rw-r--r-- | lib/textsearch.c | 1 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index bfeab3a52d12..8e268b391efe 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -136,7 +136,7 @@ config DETECT_SOFTLOCKUP help Say Y here to enable the kernel to detect "soft lockups", which are bugs that cause the kernel to loop in kernel - mode for more than 10 seconds, without giving other tasks a + mode for more than 60 seconds, without giving other tasks a chance to run. When a soft-lockup is detected, the kernel will print the @@ -148,6 +148,30 @@ config DETECT_SOFTLOCKUP can be detected via the NMI-watchdog, on platforms that support it.) +config BOOTPARAM_SOFTLOCKUP_PANIC + bool "Panic (Reboot) On Soft Lockups" + depends on DETECT_SOFTLOCKUP + help + Say Y here to enable the kernel to panic on "soft lockups", + which are bugs that cause the kernel to loop in kernel + mode for more than 60 seconds, without giving other tasks a + chance to run. + + The panic can be used in combination with panic_timeout, + to cause the system to reboot automatically after a + lockup has been detected. This feature is useful for + high-availability systems that have uptime guarantees and + where a lockup must be resolved ASAP. + + Say N if unsure. + +config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE + int + depends on DETECT_SOFTLOCKUP + range 0 1 + default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC + default 1 if BOOTPARAM_SOFTLOCKUP_PANIC + config SCHED_DEBUG bool "Collect scheduler debugging info" depends on DEBUG_KERNEL && PROC_FS diff --git a/lib/textsearch.c b/lib/textsearch.c index be8bda3862f5..a3e500ad51d7 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c @@ -97,6 +97,7 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/init.h> +#include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/err.h> #include <linux/textsearch.h> |