diff options
-rw-r--r-- | kernel/Makefile | 1 | ||||
-rw-r--r-- | lib/Kconfig.debug | 13 | ||||
-rw-r--r-- | tests/Kconfig | 13 | ||||
-rw-r--r-- | tests/Makefile | 1 | ||||
-rw-r--r-- | tests/rcutorture.c (renamed from kernel/rcutorture.c) | 0 |
5 files changed, 14 insertions, 14 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 6c584c55a6e9..53e6fb2010ee 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -56,7 +56,6 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ obj-$(CONFIG_SECCOMP) += seccomp.o -obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_CLASSIC_RCU) += rcuclassic.o obj-$(CONFIG_PREEMPT_RCU) += rcupreempt.o ifeq ($(CONFIG_PREEMPT_RCU),y) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index fdd5ab77056c..cf06f6e4f829 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -472,19 +472,6 @@ config BOOT_PRINTK_DELAY BOOT_PRINTK_DELAY also may cause DETECT_SOFTLOCKUP to detect what it believes to be lockup conditions. -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 M if you want the RCU torture tests to build as a module. - Say N if you are unsure. - config KPROBES_SANITY_TEST bool "Kprobes sanity tests" depends on DEBUG_KERNEL diff --git a/tests/Kconfig b/tests/Kconfig index 5b06a304bbed..8539ce0b0a5d 100644 --- a/tests/Kconfig +++ b/tests/Kconfig @@ -18,4 +18,17 @@ config DEBUG_LOCKING_API_SELFTESTS The following locking APIs are covered: spinlocks, rwlocks, mutexes and rwsems. +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 M if you want the RCU torture tests to build as a module. + Say N if you are unsure. + endif # KERNEL_TESTS diff --git a/tests/Makefile b/tests/Makefile index 5df95a03aa54..c253e903561f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -3,3 +3,4 @@ # obj-$(CONFIG_DEBUG_LOCKING_API_SELFTESTS) += locking-selftest.o +obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o diff --git a/kernel/rcutorture.c b/tests/rcutorture.c index fd599829e72a..fd599829e72a 100644 --- a/kernel/rcutorture.c +++ b/tests/rcutorture.c |