Merge branch 'core/rcu' into core/rcu-for-linus

1 files changed, 19 insertions, 1 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c459e8547bd8..df27132a56f4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -530,16 +530,34 @@ config BOOT_PRINTK_DELAY
 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.
 
+          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.
 
+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