---

yaml
---
r: 205399
b: refs/heads/master
c: e16bb1d
h: refs/heads/master
i:
  205397: b246622
  205395: 39da142
  205391: 9269a48
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e85391b3badd3f0e50ebdd0cafe0202a979f73a
+refs/heads/master: e16bb1d7fe07609bc8b0e4c043eff2f47ada78d8

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