hang and lockup detection menu

The hard/softlockup and hung-task entries take up 6 lines
of screen real-estate when enabled.  I bet folks don't
mess with these _that_ often, so move them in a group
down a level.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 23 insertions, 19 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a6c2c5c1a5f8..65c8e4daee4a 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -604,6 +604,8 @@ config DEBUG_SHIRQ
           Drivers ought to be able to handle interrupts coming in at those
           points; some don't and need to be caught.
 
+menu "Debug Lockups and Hangs"
+
 config LOCKUP_DETECTOR
         bool "Detect Hard and Soft Lockups"
         depends on DEBUG_KERNEL && !S390
@@ -675,25 +677,6 @@ 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"
-        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
@@ -748,6 +731,27 @@ config BOOTPARAM_HUNG_TASK_PANIC_VALUE
         default 0 if !BOOTPARAM_HUNG_TASK_PANIC
         default 1 if BOOTPARAM_HUNG_TASK_PANIC
 
+endmenu # "Debug lockups and hangs"
+
+config PANIC_ON_OOPS
+        bool "Panic on Oops"
+        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 SCHED_DEBUG
         bool "Collect scheduler debugging info"
         depends on DEBUG_KERNEL && PROC_FS