2 files changed, 2 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 66f67afad4fa..b3fdf9aee3da 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 a2ddd650cb92..e4c07b0692bb 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