diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-12 14:40:39 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-12 14:40:39 +1000 |
| commit | 765fd6a87f13ee9ef9c9e36cbc46cba1b51db362 (patch) | |
| tree | 14f96ccf656658627147271826c89fd6c9837672 /init | |
| parent | 90e6eaa2a6de81f58d9bac911936b49a2b89faff (diff) | |
| parent | b9ac3027b83eabd9686fa21c93b9fefa2d2cc760 (diff) | |
Merge commit 'tip/auto-latest'
Conflicts:
arch/x86/include/asm/socket.h
include/linux/rcupdate.h
kernel/fork.c
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7659bc5bdeeb..58ee16398537 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -320,21 +320,13 @@ choice prompt "RCU Implementation" default TREE_RCU -config CLASSIC_RCU - bool "Classic RCU" - help - This option selects the classic RCU implementation that is - designed for best read-side performance on non-realtime - systems. - - Select this option if you are unsure. - config TREE_RCU bool "Tree-based hierarchical RCU" help This option selects the RCU implementation that is designed for very large SMP system with hundreds or - thousands of CPUs. + thousands of CPUs. It also scales down nicely to + smaller systems. config PREEMPT_RCU bool "Preemptible RCU" |