2 files changed, 7 insertions, 6 deletions

diff --git a/init/Kconfig b/init/Kconfig
index a76d13189e47..9d3a7887a6d3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -302,7 +302,7 @@ choice
 # Kind of a stub config for the pure tick based cputime accounting
 config TICK_CPU_ACCOUNTING
         bool "Simple tick based cputime accounting"
-        depends on !S390
+        depends on !S390 && !NO_HZ_FULL
         help
           This is the basic tick based cputime accounting that maintains
           statistics about user, system and idle time spent on per jiffies
@@ -312,7 +312,7 @@ config TICK_CPU_ACCOUNTING
 
 config VIRT_CPU_ACCOUNTING_NATIVE
         bool "Deterministic task and CPU time accounting"
-        depends on HAVE_VIRT_CPU_ACCOUNTING
+        depends on HAVE_VIRT_CPU_ACCOUNTING && !NO_HZ_FULL
         select VIRT_CPU_ACCOUNTING
         help
           Select this option to enable more accurate task and CPU time
@@ -342,7 +342,7 @@ config VIRT_CPU_ACCOUNTING_GEN
 
 config IRQ_TIME_ACCOUNTING
         bool "Fine granularity task level IRQ time accounting"
-        depends on HAVE_IRQ_TIME_ACCOUNTING
+        depends on HAVE_IRQ_TIME_ACCOUNTING && !NO_HZ_FULL
         help
           Select this option to enable fine granularity task irq time
           accounting. This is done by reading a timestamp on each
@@ -576,7 +576,7 @@ config RCU_FANOUT_EXACT
 
 config RCU_FAST_NO_HZ
         bool "Accelerate last non-dyntick-idle CPU's grace periods"
-        depends on NO_HZ && SMP
+        depends on NO_HZ_COMMON && SMP
         default n
         help
           This option permits CPUs to enter dynticks-idle state even if
@@ -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/init/main.c b/init/main.c
index ceed17aaedfd..9484f4ba88d0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -544,6 +544,7 @@ asmlinkage void __init start_kernel(void)
         idr_init_cache();
         perf_event_init();
         rcu_init();
+        tick_nohz_init();
         radix_tree_init();
         /* init some links before init_ISA_irqs() */
         early_irq_init();