Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

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

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7936e5e..eb8917a 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -244,6 +244,7 @@ config PAGE_OWNER
        depends on DEBUG_KERNEL && STACKTRACE_SUPPORT
        select DEBUG_FS
        select STACKTRACE
+       select STACKDEPOT
        select PAGE_EXTENSION
        help
          This keeps track of what call chain is the owner of a page, may
@@ -1309,22 +1310,6 @@ config RCU_PERF_TEST
          Say M if you want the RCU performance tests to build as a module.
          Say N if you are unsure.
 
-config RCU_PERF_TEST_RUNNABLE
-       bool "performance tests for RCU runnable by default"
-       depends on RCU_PERF_TEST = y
-       default n
-       help
-         This option provides a way to build the RCU performance tests
-         directly into the kernel without them starting up at boot time.
-         You can use /sys/module to manually override this setting.
-         This /proc file is available only when the RCU performance
-         tests have been built into the kernel.
-
-         Say Y here if you want the RCU performance tests to start during
-         boot (you probably don't).
-         Say N here if you want the RCU performance tests to start only
-         after being manually enabled via /sys/module.
-
 config RCU_TORTURE_TEST
        tristate "torture tests for RCU"
        depends on DEBUG_KERNEL
@@ -1342,23 +1327,6 @@ config RCU_TORTURE_TEST
          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 RCU_TORTURE_TEST_SLOW_PREINIT
        bool "Slow down RCU grace-period pre-initialization to expose races"
        depends on RCU_TORTURE_TEST
@@ -1843,6 +1811,9 @@ config TEST_BITMAP
 
          If unsure, say N.
 
+config TEST_UUID
+       tristate "Test functions located in the uuid module at runtime"
+
 config TEST_RHASHTABLE
        tristate "Perform selftest on resizable hash table"
        default n