diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-01-21 00:12:21 -0500 |
commit | f49028292c13b958fdf4f36c8cc8119d0dde187b (patch) | |
tree | ea1f92969a8aca7083f19c4ef07dd3674509554f /lib | |
parent | eef8f4c2acac6fae84f2d959a145fa3cad4d00c9 (diff) | |
parent | 78e691f4ae2d5edea0199ca802bb505b9cdced88 (diff) |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Documentation updates.
- Miscellaneous fixes.
- Preemptible-RCU fixes, including fixing an old bug in the
interaction of RCU priority boosting and CPU hotplug.
- SRCU updates.
- RCU CPU stall-warning updates.
- RCU torture-test updates.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Kconfig.debug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 5f2ce616c046..a2ca213c71ca 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -1215,6 +1215,7 @@ config RCU_TORTURE_TEST | |||
1215 | tristate "torture tests for RCU" | 1215 | tristate "torture tests for RCU" |
1216 | depends on DEBUG_KERNEL | 1216 | depends on DEBUG_KERNEL |
1217 | select TORTURE_TEST | 1217 | select TORTURE_TEST |
1218 | select SRCU | ||
1218 | default n | 1219 | default n |
1219 | help | 1220 | help |
1220 | This option provides a kernel module that runs torture tests | 1221 | This option provides a kernel module that runs torture tests |
@@ -1257,7 +1258,7 @@ config RCU_CPU_STALL_TIMEOUT | |||
1257 | config RCU_CPU_STALL_INFO | 1258 | config RCU_CPU_STALL_INFO |
1258 | bool "Print additional diagnostics on RCU CPU stall" | 1259 | bool "Print additional diagnostics on RCU CPU stall" |
1259 | depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL | 1260 | depends on (TREE_RCU || PREEMPT_RCU) && DEBUG_KERNEL |
1260 | default n | 1261 | default y |
1261 | help | 1262 | help |
1262 | For each stalled CPU that is aware of the current RCU grace | 1263 | For each stalled CPU that is aware of the current RCU grace |
1263 | period, print out additional per-CPU diagnostic information | 1264 | period, print out additional per-CPU diagnostic information |