Merge branch 'torture.2014.02.23a' into HEAD

torture.2014.02.23a: locktorture addition and rcutorture changes

1 files changed, 20 insertions, 0 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index a48abeac753f..dd7f8858188a 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -980,6 +980,21 @@ config DEBUG_LOCKING_API_SELFTESTS
           The following locking APIs are covered: spinlocks, rwlocks,
           mutexes and rwsems.
 
+config LOCK_TORTURE_TEST
+        tristate "torture tests for locking"
+        depends on DEBUG_KERNEL
+        select TORTURE_TEST
+        default n
+        help
+          This option provides a kernel module that runs torture tests
+          on kernel locking primitives.  The kernel module may be built
+          after the fact on the running kernel to be tested, if desired.
+
+          Say Y here if you want kernel locking-primitive torture tests
+          to be built into the kernel.
+          Say M if you want these torture tests to build as a module.
+          Say N if you are unsure.
+
 endmenu # lock debugging
 
 config TRACE_IRQFLAGS
@@ -1141,9 +1156,14 @@ config SPARSE_RCU_POINTER
 
          Say N if you are unsure.
 
+config TORTURE_TEST
+        tristate
+        default n
+
 config RCU_TORTURE_TEST
         tristate "torture tests for RCU"
         depends on DEBUG_KERNEL
+        select TORTURE_TEST
         default n
         help
           This option provides a kernel module that runs torture tests