Merge commit 'v2.6.34-rc7' into perf/nmi

[mirror_ubuntu-artful-kernel.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 1fafb4b99c9bb30c37e151a2db441e3cc9c5fb5f..220ae6063b6f220dafba15d80c32deabc4453e37 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -171,6 +171,18 @@ config DETECT_SOFTLOCKUP
           can be detected via the NMI-watchdog, on platforms that
           support it.)
 
+config NMI_WATCHDOG
+       bool "Detect Hard Lockups with an NMI Watchdog"
+       depends on DEBUG_KERNEL && PERF_EVENTS && PERF_EVENTS_NMI
+       help
+         Say Y here to enable the kernel to use the NMI as a watchdog
+         to detect hard lockups.  This is useful when a cpu hangs for no
+         reason but can still respond to NMIs.  A backtrace is displayed
+         for reviewing and reporting.
+
+         The overhead should be minimal, just an extra NMI every few
+         seconds.
+
 config BOOTPARAM_SOFTLOCKUP_PANIC
        bool "Panic (Reboot) On Soft Lockups"
        depends on DETECT_SOFTLOCKUP
@@ -356,7 +368,7 @@ config SLUB_STATS
 config DEBUG_KMEMLEAK
        bool "Kernel memory leak detector"
        depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \
-               (X86 || ARM || PPC || S390 || SUPERH)
+               (X86 || ARM || PPC || S390 || SPARC64 || SUPERH || MICROBLAZE)
 
        select DEBUG_FS if SYSFS
        select STACKTRACE if STACKTRACE_SUPPORT