aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 15:10:12 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-15 15:10:12 -0400
commit6c9fcaf2eec1b9f85226a694230dd957dd7926b3 (patch)
treef8c824c6c64dc411752c844f116e693760768bcc /lib
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff)
parent199a952876adbfc2b6c13b8b07adabebf4ff54b2 (diff)
Merge branch 'core/rcu' into core/rcu-for-linus
Diffstat (limited to 'lib')
-rw-r--r--lib/Kconfig.debug20
-rw-r--r--lib/textsearch.c1
2 files changed, 20 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index c459e8547bd8..df27132a56f4 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -530,16 +530,34 @@ config BOOT_PRINTK_DELAY
530config RCU_TORTURE_TEST 530config RCU_TORTURE_TEST
531 tristate "torture tests for RCU" 531 tristate "torture tests for RCU"
532 depends on DEBUG_KERNEL 532 depends on DEBUG_KERNEL
533 depends on m
534 default n 533 default n
535 help 534 help
536 This option provides a kernel module that runs torture tests 535 This option provides a kernel module that runs torture tests
537 on the RCU infrastructure. The kernel module may be built 536 on the RCU infrastructure. The kernel module may be built
538 after the fact on the running kernel to be tested, if desired. 537 after the fact on the running kernel to be tested, if desired.
539 538
539 Say Y here if you want RCU torture tests to be built into
540 the kernel.
540 Say M if you want the RCU torture tests to build as a module. 541 Say M if you want the RCU torture tests to build as a module.
541 Say N if you are unsure. 542 Say N if you are unsure.
542 543
544config RCU_TORTURE_TEST_RUNNABLE
545 bool "torture tests for RCU runnable by default"
546 depends on RCU_TORTURE_TEST = y
547 default n
548 help
549 This option provides a way to build the RCU torture tests
550 directly into the kernel without them starting up at boot
551 time. You can use /proc/sys/kernel/rcutorture_runnable
552 to manually override this setting. This /proc file is
553 available only when the RCU torture tests have been built
554 into the kernel.
555
556 Say Y here if you want the RCU torture tests to start during
557 boot (you probably don't).
558 Say N here if you want the RCU torture tests to start only
559 after being manually enabled via /proc.
560
543config KPROBES_SANITY_TEST 561config KPROBES_SANITY_TEST
544 bool "Kprobes sanity tests" 562 bool "Kprobes sanity tests"
545 depends on DEBUG_KERNEL 563 depends on DEBUG_KERNEL
diff --git a/lib/textsearch.c b/lib/textsearch.c
index be8bda3862f5..a3e500ad51d7 100644
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -97,6 +97,7 @@
97#include <linux/types.h> 97#include <linux/types.h>
98#include <linux/string.h> 98#include <linux/string.h>
99#include <linux/init.h> 99#include <linux/init.h>
100#include <linux/rculist.h>
100#include <linux/rcupdate.h> 101#include <linux/rcupdate.h>
101#include <linux/err.h> 102#include <linux/err.h>
102#include <linux/textsearch.h> 103#include <linux/textsearch.h>