summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorPranith Kumar <bobby.prani@gmail.com>2015-04-21 17:29:42 -0400
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2015-05-27 12:59:06 -0700
commite72aeafc66060d3fc6b4d2120db00058572b3186 (patch)
tree74f9b389cf36209f661b0437d84bc4ca31c58b29 /init
parent26730f55c2842b4ee06a5307d58265db7dd26065 (diff)
downloadlinux-stable-e72aeafc66060d3fc6b4d2120db00058572b3186.tar.gz
linux-stable-e72aeafc66060d3fc6b4d2120db00058572b3186.tar.bz2
linux-stable-e72aeafc66060d3fc6b4d2120db00058572b3186.zip
rcu: Remove prompt for RCU implementation
The RCU implementation is chosen based on PREEMPT and SMP config options and is not really a user-selectable choice. This commit removes the menu entry, given that there is not much point in calling something a choice when there is in fact no choice.. The TINY_RCU, TREE_RCU, and PREEMPT_RCU Kconfig options continue to be selected based solely on the values of the PREEMPT and SMP options. Signed-off-by: Pranith Kumar <bobby.prani@gmail.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig18
1 files changed, 6 insertions, 12 deletions
diff --git a/init/Kconfig b/init/Kconfig
index af2c93c4a105..4c08197044f1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -465,13 +465,9 @@ endmenu # "CPU/Task time and stats accounting"
menu "RCU Subsystem"
-choice
- prompt "RCU Implementation"
- default TREE_RCU
-
config TREE_RCU
- bool "Tree-based hierarchical RCU"
- depends on !PREEMPT && SMP
+ bool
+ default y if !PREEMPT && SMP
help
This option selects the RCU implementation that is
designed for very large SMP system with hundreds or
@@ -479,8 +475,8 @@ config TREE_RCU
smaller systems.
config PREEMPT_RCU
- bool "Preemptible tree-based hierarchical RCU"
- depends on PREEMPT
+ bool
+ default y if PREEMPT
help
This option selects the RCU implementation that is
designed for very large SMP systems with hundreds or
@@ -491,16 +487,14 @@ config PREEMPT_RCU
Select this option if you are unsure.
config TINY_RCU
- bool "UP-only small-memory-footprint RCU"
- depends on !PREEMPT && !SMP
+ bool
+ default y if !PREEMPT && !SMP
help
This option selects the RCU implementation that is
designed for UP systems from which real-time response
is not required. This option greatly reduces the
memory footprint of RCU.
-endchoice
-
config RCU_EXPERT
bool "Make expert-level adjustments to RCU configuration"
default n