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 <[email protected]>
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 Gortmaker <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Thomas Gleixner <[email protected]>

diff --git a/init/Kconfig b/init/Kconfig
index 66f67afad4fad4758d802938d5c3a4fefbc4dbf4..b3fdf9aee3da197150e7efed002330970d509fe0 100644 (file)
--- 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 a2ddd650cb92f98a50b3ba1fb9befd3ff07e3b6d..e4c07b0692bbba4a79676ffceed77324fd6087bf 100644 (file)
--- 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