diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 22:50:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 22:50:03 -0400 |
| commit | 20f3f3ca499d2c211771ba552685398b65d83859 (patch) | |
| tree | 41b460196a0860e11d12e33e3172463973cb0078 /init | |
| parent | 769f3e8c384795cc350e2aae27de2a12374d19d4 (diff) | |
| parent | 41c51c98f588edcdf6141cff1895df738e03ddd4 (diff) | |
Merge branch 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: rcu_sched_grace_period(): kill the bogus flush_signals()
rculist: use list_entry_rcu in places where it's appropriate
rculist.h: introduce list_entry_rcu() and list_first_entry_rcu()
rcu: Update RCU tracing documentation for __rcu_pending
rcu: Add __rcu_pending tracing to hierarchical RCU
RCU: make treercu be default
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7be4d383674..d4e9671347e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -308,7 +308,7 @@ menu "RCU Subsystem" | |||
| 308 | 308 | ||
| 309 | choice | 309 | choice |
| 310 | prompt "RCU Implementation" | 310 | prompt "RCU Implementation" |
| 311 | default CLASSIC_RCU | 311 | default TREE_RCU |
| 312 | 312 | ||
| 313 | config CLASSIC_RCU | 313 | config CLASSIC_RCU |
| 314 | bool "Classic RCU" | 314 | bool "Classic RCU" |