2014-09-02 19:07 GMT+02:00 Paul E. McKenney <paul...@linux.vnet.ibm.com>: > On Fri, Aug 29, 2014 at 03:08:20PM +0200, Stefan Hengelein wrote: >> 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.hengel...@fau.de> >> Signed-off-by: Andreas Ruprecht <rup...@einserver.de> > > Looks like a nice improvement, but could you please forward-port to branch > rcu/dev of > git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git? > > Thanx, Paul
done, i attached the adjusted patch. Best Regards, Stefan > >> --- >> init/Kconfig | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/init/Kconfig b/init/Kconfig >> index 197b563..d604000 100644 >> --- a/init/Kconfig >> +++ b/init/Kconfig >> @@ -729,6 +729,7 @@ config RCU_NOCB_CPU >> choice >> prompt "Build-forced no-CBs CPUs" >> default RCU_NOCB_CPU_NONE >> + depends on RCU_NOCB_CPU >> help >> This option allows no-CBs CPUs (whose RCU callbacks are invoked >> from kthreads rather than from softirq context) to be specified >> @@ -737,7 +738,7 @@ choice >> >> config RCU_NOCB_CPU_NONE >> bool "No build_forced no-CBs CPUs" >> - depends on RCU_NOCB_CPU && !NO_HZ_FULL_ALL >> + depends on !NO_HZ_FULL_ALL >> help >> This option does not force any of the CPUs to be no-CBs CPUs. >> Only CPUs designated by the rcu_nocbs= boot parameter will be >> @@ -751,7 +752,7 @@ config RCU_NOCB_CPU_NONE >> >> config RCU_NOCB_CPU_ZERO >> bool "CPU 0 is a build_forced no-CBs CPU" >> - depends on RCU_NOCB_CPU && !NO_HZ_FULL_ALL >> + depends on !NO_HZ_FULL_ALL >> help >> This option forces CPU 0 to be a no-CBs CPU, so that its RCU >> callbacks are invoked by a per-CPU kthread whose name begins >> @@ -766,7 +767,6 @@ config RCU_NOCB_CPU_ZERO >> >> config RCU_NOCB_CPU_ALL >> bool "All CPUs are build_forced no-CBs CPUs" >> - depends on RCU_NOCB_CPU >> help >> This option forces all CPUs to be no-CBs CPUs. The rcu_nocbs= >> boot parameter will be ignored. All CPUs' RCU callbacks will >> -- >> 1.9.1 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majord...@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >> >
From 1f82e1240eba4b31091bcff0e3c126853adacb53 Mon Sep 17 00:00:00 2001 From: Stefan Hengelein <stefan.hengel...@fau.de> Date: Tue, 2 Sep 2014 19:55:11 +0200 Subject: [PATCH] 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.hengel...@fau.de> Signed-off-by: Andreas Ruprecht <rup...@einserver.de> Reviewed-by: Josh Triplett <j...@joshtriplett.org> Signed-off-by: Andrew Morton <a...@linux-foundation.org> --- init/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/init/Kconfig b/init/Kconfig index 4fe5500..95a1447 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -739,6 +739,7 @@ config RCU_NOCB_CPU choice prompt "Build-forced no-CBs CPUs" default RCU_NOCB_CPU_NONE + depends on RCU_NOCB_CPU help This option allows no-CBs CPUs (whose RCU callbacks are invoked from kthreads rather than from softirq context) to be specified @@ -747,7 +748,6 @@ choice config RCU_NOCB_CPU_NONE bool "No build_forced no-CBs CPUs" - depends on RCU_NOCB_CPU help This option does not force any of the CPUs to be no-CBs CPUs. Only CPUs designated by the rcu_nocbs= boot parameter will be @@ -761,7 +761,6 @@ config RCU_NOCB_CPU_NONE config RCU_NOCB_CPU_ZERO bool "CPU 0 is a build_forced no-CBs CPU" - depends on RCU_NOCB_CPU help This option forces CPU 0 to be a no-CBs CPU, so that its RCU callbacks are invoked by a per-CPU kthread whose name begins @@ -776,7 +775,6 @@ config RCU_NOCB_CPU_ZERO config RCU_NOCB_CPU_ALL bool "All CPUs are build_forced no-CBs CPUs" - depends on RCU_NOCB_CPU help This option forces all CPUs to be no-CBs CPUs. The rcu_nocbs= boot parameter will be ignored. All CPUs' RCU callbacks will -- 1.9.1
