diff options
| author | Stefan Hengelein | 2014-09-02 12:55:11 -0500 |
|---|---|---|
| committer | Paul E. McKenney | 2014-10-28 15:49:27 -0500 |
| commit | 4568779f7143f88fc5fbe7a8d619653e28f24ad1 (patch) | |
| tree | 5e9c24327073166018b4ae3c626980be37f1d347 /init/Kconfig | |
| parent | d7e29933969e5ca7c112ce1368a07911f4485dc2 (diff) | |
| download | kernel-4568779f7143f88fc5fbe7a8d619653e28f24ad1.tar.gz kernel-4568779f7143f88fc5fbe7a8d619653e28f24ad1.tar.xz kernel-4568779f7143f88fc5fbe7a8d619653e28f24ad1.zip | |
init/Kconfig: move RCU_NOCB_CPU dependencies to choice
Every choice item of the "Build-forced no-CBs CPUs" choice had a
dependency to RCU_NOCB_CPU. It's more comprehensible if the choice
itself has the dependency instead of every choice item. The choice
itself doesn't need to be visible if there are no items selectable
(i.e. on arch/frv) or RCU_NOCB_CPU is not defined.
Signed-off-by: Stefan Hengelein <stefan.hengelein@fau.de>
Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3ee28ae02cc8..0c9546ba56e8 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -739,6 +739,7 @@ config RCU_NOCB_CPU | |||
| 739 | choice | 739 | choice |
| 740 | prompt "Build-forced no-CBs CPUs" | 740 | prompt "Build-forced no-CBs CPUs" |
| 741 | default RCU_NOCB_CPU_NONE | 741 | default RCU_NOCB_CPU_NONE |
| 742 | depends on RCU_NOCB_CPU | ||
| 742 | help | 743 | help |
| 743 | This option allows no-CBs CPUs (whose RCU callbacks are invoked | 744 | This option allows no-CBs CPUs (whose RCU callbacks are invoked |
| 744 | from kthreads rather than from softirq context) to be specified | 745 | from kthreads rather than from softirq context) to be specified |
| @@ -747,7 +748,6 @@ choice | |||
| 747 | 748 | ||
| 748 | config RCU_NOCB_CPU_NONE | 749 | config RCU_NOCB_CPU_NONE |
| 749 | bool "No build_forced no-CBs CPUs" | 750 | bool "No build_forced no-CBs CPUs" |
| 750 | depends on RCU_NOCB_CPU | ||
| 751 | help | 751 | help |
| 752 | This option does not force any of the CPUs to be no-CBs CPUs. | 752 | This option does not force any of the CPUs to be no-CBs CPUs. |
| 753 | Only CPUs designated by the rcu_nocbs= boot parameter will be | 753 | Only CPUs designated by the rcu_nocbs= boot parameter will be |
| @@ -761,7 +761,6 @@ config RCU_NOCB_CPU_NONE | |||
| 761 | 761 | ||
| 762 | config RCU_NOCB_CPU_ZERO | 762 | config RCU_NOCB_CPU_ZERO |
| 763 | bool "CPU 0 is a build_forced no-CBs CPU" | 763 | bool "CPU 0 is a build_forced no-CBs CPU" |
| 764 | depends on RCU_NOCB_CPU | ||
| 765 | help | 764 | help |
| 766 | This option forces CPU 0 to be a no-CBs CPU, so that its RCU | 765 | This option forces CPU 0 to be a no-CBs CPU, so that its RCU |
| 767 | callbacks are invoked by a per-CPU kthread whose name begins | 766 | callbacks are invoked by a per-CPU kthread whose name begins |
| @@ -776,7 +775,6 @@ config RCU_NOCB_CPU_ZERO | |||
| 776 | 775 | ||
| 777 | config RCU_NOCB_CPU_ALL | 776 | config RCU_NOCB_CPU_ALL |
| 778 | bool "All CPUs are build_forced no-CBs CPUs" | 777 | bool "All CPUs are build_forced no-CBs CPUs" |
| 779 | depends on RCU_NOCB_CPU | ||
| 780 | help | 778 | help |
| 781 | This option forces all CPUs to be no-CBs CPUs. The rcu_nocbs= | 779 | This option forces all CPUs to be no-CBs CPUs. The rcu_nocbs= |
| 782 | boot parameter will be ignored. All CPUs' RCU callbacks will | 780 | boot parameter will be ignored. All CPUs' RCU callbacks will |