Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[pandora-kernel.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index d8b6279..ba106db 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -74,6 +74,9 @@ config DEBUG_FS
          debugging files into.  Enable this option to be able to read and
          write to these files.
 
          debugging files into.  Enable this option to be able to read and
          write to these files.
 

+         For detailed documentation on the debugfs API, see
+         Documentation/DocBook/filesystems.
+

          If unsure, say N.
 
 config HEADERS_CHECK
          If unsure, say N.
 
 config HEADERS_CHECK


@@ -419,7 +422,6 @@ config DEBUG_LOCKING_API_SELFTESTS
 
 config STACKTRACE
        bool
 
 config STACKTRACE
        bool

-       depends on DEBUG_KERNEL

        depends on STACKTRACE_SUPPORT
 
 config DEBUG_KOBJECT
        depends on STACKTRACE_SUPPORT
 
 config DEBUG_KOBJECT


@@ -531,16 +533,34 @@ config BOOT_PRINTK_DELAY
 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL
 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL

-       depends on m

        default n
        help
          This option provides a kernel module that runs torture tests
          on the RCU infrastructure.  The kernel module may be built
          after the fact on the running kernel to be tested, if desired.
 
        default n
        help
          This option provides a kernel module that runs torture tests
          on the RCU infrastructure.  The kernel module may be built
          after the fact on the running kernel to be tested, if desired.
 

+         Say Y here if you want RCU torture tests to be built into
+         the kernel.

          Say M if you want the RCU torture tests to build as a module.
          Say N if you are unsure.
 
          Say M if you want the RCU torture tests to build as a module.
          Say N if you are unsure.
 

+config RCU_TORTURE_TEST_RUNNABLE
+       bool "torture tests for RCU runnable by default"
+       depends on RCU_TORTURE_TEST = y
+       default n
+       help
+         This option provides a way to build the RCU torture tests
+         directly into the kernel without them starting up at boot
+         time.  You can use /proc/sys/kernel/rcutorture_runnable
+         to manually override this setting.  This /proc file is
+         available only when the RCU torture tests have been built
+         into the kernel.
+
+         Say Y here if you want the RCU torture tests to start during
+         boot (you probably don't).
+         Say N here if you want the RCU torture tests to start only
+         after being manually enabled via /proc.
+

 config KPROBES_SANITY_TEST
        bool "Kprobes sanity tests"
        depends on DEBUG_KERNEL
 config KPROBES_SANITY_TEST
        bool "Kprobes sanity tests"
        depends on DEBUG_KERNEL


@@ -563,6 +583,9 @@ config BACKTRACE_SELF_TEST
          for distributions or general kernels, but only for kernel
          developers working on architecture code.
 
          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
          Say N if you are unsure.
 
 config LKDTM