diff --git a/[refs] b/[refs]
index 0a6baff5d914..18b72355c32b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6acedbeac17dea1c1eed85048a72e188f3f768
+refs/heads/master: 9aaffc898ff4a3df18c5fc4b9e0fa47e779ad726
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index fbc5c622acb0..1ba77ca7d165 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -378,14 +378,13 @@ config FORCED_INLINING
 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 start automatically
-	  at boot time (you probably don't).
 	  Say M if you want the RCU torture tests to build as a module.
 	  Say N if you are unsure.