Merge remote-tracking branch 'rcu/rcu/next'

[deliverable/linux.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 2e2cca5092318faf62d10ed96a3b7d0a8b9cc129..785f04c80fcfabfb4b3c14d2b5039a98abb21103 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1214,7 +1214,7 @@ config DEBUG_BUGVERBOSE
 
 config DEBUG_LIST
        bool "Debug linked list manipulation"
-       depends on DEBUG_KERNEL
+       depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
        help
          Enable this to turn on extended checks in the linked-list
          walking routines.
@@ -1307,6 +1307,7 @@ config TORTURE_TEST
 config RCU_PERF_TEST
        tristate "performance tests for RCU"
        depends on DEBUG_KERNEL
+       depends on !UML
        select TORTURE_TEST
        select SRCU
        select TASKS_RCU
@@ -1324,6 +1325,7 @@ config RCU_PERF_TEST
 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL
+       depends on !UML
        select TORTURE_TEST
        select SRCU
        select TASKS_RCU
@@ -1413,6 +1415,24 @@ config RCU_TORTURE_TEST_SLOW_CLEANUP_DELAY
          This option specifies the number of jiffies to wait between
          each rcu_node structure cleanup operation.
 
+config WAKE_TORTURE_TEST
+       tristate "Torture test for wakeups and CPU hotplug"
+       depends on DEBUG_KERNEL
+       depends on 64BIT
+       depends on TRACE_CLOCK
+       select TORTURE_TEST
+       default n
+       help
+         This option provides a kernel module that runs torture tests
+         on wakeups from timed waits in the presence of CPU hotplug.
+         The kernel module may be built after the fact on the running
+         kernel to be tested, if desired.
+
+         Say Y here if you want wakeup torture tests to be built into
+         the kernel.
+         Say M if you want the wakeup torture tests to build as a module.
+         Say N if you are unsure.
+
 config RCU_CPU_STALL_TIMEOUT
        int "RCU CPU stall timeout in seconds"
        depends on RCU_STALL_COMMON
@@ -1969,6 +1989,16 @@ config TEST_STATIC_KEYS
 
          If unsure, say N.
 
+config BUG_ON_DATA_CORRUPTION
+       bool "Trigger a BUG when data corruption is detected"
+       select DEBUG_LIST
+       help
+         Select this option if the kernel should BUG when it encounters
+         data corruption in kernel memory structures when they get checked
+         for validity.
+
+         If unsure, say N.
+
 source "samples/Kconfig"
 
 source "lib/Kconfig.kgdb"