diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:20:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-11 16:20:18 -0400 |
| commit | eee2775d9924b22643bd89b2e568cc5eed7e8a04 (patch) | |
| tree | 095ad7851895c5d39596f3ff7ee1e078235a2501 /lib | |
| parent | 53e16fbd30005905168d9b75555fdc7e0a2eac58 (diff) | |
| parent | 7db905e636f08ea5bc9825c1f73d77802e8ccad5 (diff) | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
rcu: Move end of special early-boot RCU operation earlier
rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments
rcu: Create rcutree plugins to handle hotplug CPU for multi-level trees
rcu: Remove lockdep annotations from RCU's _notrace() API members
rcu: Add #ifdef to suppress __rcu_offline_cpu() warning in !HOTPLUG_CPU builds
rcu: Add CPU-offline processing for single-node configurations
rcu: Add "notrace" to RCU function headers used by ftrace
rcu: Remove CONFIG_PREEMPT_RCU
rcu: Merge preemptable-RCU functionality into hierarchical RCU
rcu: Simplify rcu_pending()/rcu_check_callbacks() API
rcu: Use debugfs_remove_recursive() simplify code.
rcu: Merge per-RCU-flavor initialization into pre-existing macro
rcu: Fix online/offline indication for rcudata.csv trace file
rcu: Consolidate sparse and lockdep declarations in include/linux/rcupdate.h
rcu: Renamings to increase RCU clarity
rcu: Move private definitions from include/linux/rcutree.h to kernel/rcutree.h
rcu: Expunge lingering references to CONFIG_CLASSIC_RCU, optimize on !SMP
rcu: Delay rcu_barrier() wait until beginning of next CPU-hotunplug operation.
rcu: Fix typo in rcu_irq_exit() comment header
rcu: Make rcupreempt_trace.c look at offline CPUs
...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index fbb87cf138c5..7dbd5d9c29a4 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -740,7 +740,7 @@ config RCU_TORTURE_TEST_RUNNABLE | |||
| 740 | 740 | ||
| 741 | config RCU_CPU_STALL_DETECTOR | 741 | config RCU_CPU_STALL_DETECTOR |
| 742 | bool "Check for stalled CPUs delaying RCU grace periods" | 742 | bool "Check for stalled CPUs delaying RCU grace periods" |
| 743 | depends on CLASSIC_RCU || TREE_RCU | 743 | depends on TREE_RCU || TREE_PREEMPT_RCU |
| 744 | default n | 744 | default n |
| 745 | help | 745 | help |
| 746 | This option causes RCU to printk information on which | 746 | This option causes RCU to printk information on which |