1 files changed, 42 insertions, 5 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 9638d99644af..6cdcf38f2da9 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -186,6 +186,44 @@ config BOOTPARAM_SOFTLOCKUP_PANIC_VALUE
         default 0 if !BOOTPARAM_SOFTLOCKUP_PANIC
         default 1 if BOOTPARAM_SOFTLOCKUP_PANIC
 
+config DETECT_HUNG_TASK
+        bool "Detect Hung Tasks"
+        depends on DEBUG_KERNEL
+        default DETECT_SOFTLOCKUP
+        help
+          Say Y here to enable the kernel to detect "hung tasks",
+          which are bugs that cause the task to be stuck in
+          uninterruptible "D" state indefinitiley.
+
+          When a hung task is detected, the kernel will print the
+          current stack trace (which you should report), but the
+          task will stay in uninterruptible state. If lockdep is
+          enabled then all held locks will also be reported. This
+          feature has negligible overhead.
+
+config BOOTPARAM_HUNG_TASK_PANIC
+        bool "Panic (Reboot) On Hung Tasks"
+        depends on DETECT_HUNG_TASK
+        help
+          Say Y here to enable the kernel to panic on "hung tasks",
+          which are bugs that cause the kernel to leave a task stuck
+          in uninterruptible "D" state.
+
+          The panic can be used in combination with panic_timeout,
+          to cause the system to reboot automatically after a
+          hung task has been detected. This feature is useful for
+          high-availability systems that have uptime guarantees and
+          where a hung tasks must be resolved ASAP.
+
+          Say N if unsure.
+
+config BOOTPARAM_HUNG_TASK_PANIC_VALUE
+        int
+        depends on DETECT_HUNG_TASK
+        range 0 1
+        default 0 if !BOOTPARAM_HUNG_TASK_PANIC
+        default 1 if BOOTPARAM_HUNG_TASK_PANIC
+
 config SCHED_DEBUG
         bool "Collect scheduler debugging info"
         depends on DEBUG_KERNEL && PROC_FS
@@ -402,7 +440,7 @@ config LOCKDEP
         bool
         depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
         select STACKTRACE
-        select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND
+        select FRAME_POINTER if !X86 && !MIPS && !PPC && !ARM_UNWIND && !S390
         select KALLSYMS
         select KALLSYMS_ALL
 
@@ -582,7 +620,7 @@ config ARCH_WANT_FRAME_POINTERS
 config FRAME_POINTER
         bool "Compile the kernel with frame pointers"
         depends on DEBUG_KERNEL && \
-                (CRIS || M68K || M68KNOMMU || FRV || UML || S390 || \
+                (CRIS || M68K || M68KNOMMU || FRV || UML || \
                  AVR32 || SUPERH || BLACKFIN || MN10300) || \
                 ARCH_WANT_FRAME_POINTERS
         default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS
@@ -771,13 +809,13 @@ config FAULT_INJECTION_STACKTRACE_FILTER
         depends on FAULT_INJECTION_DEBUG_FS && STACKTRACE_SUPPORT
         depends on !X86_64
         select STACKTRACE
-        select FRAME_POINTER if !PPC
+        select FRAME_POINTER if !PPC && !S390
         help
           Provide stacktrace filter for fault-injection capabilities
 
 config LATENCYTOP
         bool "Latency measuring infrastructure"
-        select FRAME_POINTER if !MIPS && !PPC
+        select FRAME_POINTER if !MIPS && !PPC && !S390
         select KALLSYMS
         select KALLSYMS_ALL
         select STACKTRACE
@@ -853,7 +891,6 @@ config DYNAMIC_DEBUG
         default n
         depends on PRINTK
         depends on DEBUG_FS
-        select PRINTK_DEBUG
         help
 
           Compiles debug level messages into the kernel, which would not