From 9e5f79733c7a876ca84328f41482eed64e4cbbf6 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sat, 15 May 2010 22:30:22 +0200 Subject: [PATCH] --- yaml --- r: 205399 b: refs/heads/master c: e16bb1d7fe07609bc8b0e4c043eff2f47ada78d8 h: refs/heads/master i: 205397: b246622cfa185cc8f8c06a2ea67d837afe137cf5 205395: 39da14209dba0ef6ff4eea7e3dc0bfdf46c9f6b4 205391: 9269a48483eca6fbc290022bade8ed781c581ed3 v: v3 --- [refs] | 2 +- trunk/lib/Kconfig.debug | 25 +++---------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/[refs] b/[refs] index 2c561d07b0e5..3ea48f4cb7e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e85391b3badd3f0e50ebdd0cafe0202a979f73a +refs/heads/master: e16bb1d7fe07609bc8b0e4c043eff2f47ada78d8 diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 755713a359e2..3a18b0b856ce 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -152,29 +152,10 @@ config DEBUG_SHIRQ Drivers ought to be able to handle interrupts coming in at those points; some don't and need to be caught. -config DETECT_SOFTLOCKUP - bool - depends on DEBUG_KERNEL && !S390 - default y - 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 60 seconds, without giving other tasks a - chance to run. - - When a soft-lockup is detected, the kernel will print the - current stack trace (which you should report), but the - system will stay locked up. This feature has negligible - overhead. - - (Note that "hard lockups" are separate type of bugs that - can be detected via the NMI-watchdog, on platforms that - support it.) - config LOCKUP_DETECTOR bool "Detect Hard and Soft Lockups" - depends on DEBUG_KERNEL - default DETECT_SOFTLOCKUP + depends on DEBUG_KERNEL && !S390 + default y help Say Y here to enable the kernel to act as a watchdog to detect hard and soft lockups. @@ -212,7 +193,7 @@ config BOOTPARAM_SOFTLOCKUP_PANIC config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE int - depends on DETECT_SOFTLOCKUP + depends on LOCKUP_DETECTOR range 0 1 default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC default 1 if BOOTPARAM_SOFTLOCKUP_PANIC