aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2013-05-02 19:28:12 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2013-05-04 02:30:34 -0400
commit73c30828771acafb0a5e3a1c4cf75e6c5dc5f98a (patch)
tree08cfdcede966b63ff30ccaf6490535c7cc24a441 /init/Kconfig
parentc032862fba51a3ca504752d3a25186b324c5ce83 (diff)
rcu: Fix full dynticks' dependency on wide RCU nocb mode
Commit 0637e029392386e6996f5d6574aadccee8315efa ("nohz: Select wide RCU nocb for full dynticks") intended to force CONFIG_RCU_NOCB_CPU_ALL=y when full dynticks is enabled. However this option is part of a choice menu and Kconfig's "select" instruction has no effect on such targets. Fix this by using reverse dependencies on the targets we don't want instead. Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Christoph Lameter <cl@linux.com> Cc: Hakan Akkan <hakanakkan@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Kevin Hilman <khilman@linaro.org> Cc: Li Zhong <zhong@linux.vnet.ibm.com> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 66f67afad4fa..b3fdf9aee3da 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -687,7 +687,7 @@ choice
687 687
688config RCU_NOCB_CPU_NONE 688config RCU_NOCB_CPU_NONE
689 bool "No build_forced no-CBs CPUs" 689 bool "No build_forced no-CBs CPUs"
690 depends on RCU_NOCB_CPU 690 depends on RCU_NOCB_CPU && !NO_HZ_FULL
691 help 691 help
692 This option does not force any of the CPUs to be no-CBs CPUs. 692 This option does not force any of the CPUs to be no-CBs CPUs.
693 Only CPUs designated by the rcu_nocbs= boot parameter will be 693 Only CPUs designated by the rcu_nocbs= boot parameter will be
@@ -695,7 +695,7 @@ config RCU_NOCB_CPU_NONE
695 695
696config RCU_NOCB_CPU_ZERO 696config RCU_NOCB_CPU_ZERO
697 bool "CPU 0 is a build_forced no-CBs CPU" 697 bool "CPU 0 is a build_forced no-CBs CPU"
698 depends on RCU_NOCB_CPU 698 depends on RCU_NOCB_CPU && !NO_HZ_FULL
699 help 699 help
700 This option forces CPU 0 to be a no-CBs CPU. Additional CPUs 700 This option forces CPU 0 to be a no-CBs CPU. Additional CPUs
701 may be designated as no-CBs CPUs using the rcu_nocbs= boot 701 may be designated as no-CBs CPUs using the rcu_nocbs= boot