Merge branch 'linus' into core/softlockup

[karo-tx-linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 509ae35a9ef5c71371e5c86451bf59ec45953227..011e00bcfc306919886cb59dba046e1ededec5a7 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -443,7 +443,6 @@ config DEBUG_LOCKING_API_SELFTESTS
 
 config STACKTRACE
        bool
-       depends on DEBUG_KERNEL
        depends on STACKTRACE_SUPPORT
 
 config DEBUG_KOBJECT
@@ -587,6 +586,9 @@ config BACKTRACE_SELF_TEST
          for distributions or general kernels, but only for kernel
          developers working on architecture code.
 
+         Note that if you want to also test saved backtraces, you will
+         have to enable STACKTRACE as well.
+
          Say N if you are unsure.
 
 config LKDTM
@@ -658,6 +660,8 @@ config LATENCYTOP
          Enable this option if you want to use the LatencyTOP tool
          to find out which userspace is blocking on what kernel operations.
 
+source kernel/trace/Kconfig
+
 config PROVIDE_OHCI1394_DMA_INIT
        bool "Remote debugging over FireWire early on boot"
        depends on PCI && X86