On Fri, May 03, 2013 at 06:47:55PM +0200, Frederic Weisbecker wrote:
> 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.
>
> Signed-off-by: Frederic Weisbecker <[email protected]>
> Cc: Christoph Lameter <[email protected]>
> Cc: Hakan Akkan <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> Cc: Kevin Hilman <[email protected]>
> Cc: Li Zhong <[email protected]>
> Cc: Paul E. McKenney <[email protected]>
> Cc: Paul Gortmaker <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Cc: Steven Rostedt <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
Reviewed-by: Paul E. McKenney <[email protected]>
> ---
> init/Kconfig | 4 ++--
> kernel/time/Kconfig | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/init/Kconfig b/init/Kconfig
> index 66f67af..b3fdf9a 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -687,7 +687,7 @@ choice
>
> config RCU_NOCB_CPU_NONE
> bool "No build_forced no-CBs CPUs"
> - depends on RCU_NOCB_CPU
> + depends on RCU_NOCB_CPU && !NO_HZ_FULL
> 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
> @@ -695,7 +695,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
> + depends on RCU_NOCB_CPU && !NO_HZ_FULL
> help
> This option forces CPU 0 to be a no-CBs CPU. Additional CPUs
> may be designated as no-CBs CPUs using the rcu_nocbs= boot
> diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
> index a2ddd65..e4c07b0 100644
> --- a/kernel/time/Kconfig
> +++ b/kernel/time/Kconfig
> @@ -109,7 +109,6 @@ config NO_HZ_FULL
> select NO_HZ_COMMON
> select RCU_USER_QS
> select RCU_NOCB_CPU
> - select RCU_NOCB_CPU_ALL
> select VIRT_CPU_ACCOUNTING_GEN
> select CONTEXT_TRACKING_FORCE
> select IRQ_WORK
> --
> 1.7.5.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
