diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-04-25 08:51:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-25 08:51:28 +0200 |
| commit | 666a15ffbae110fa7a4f2ff628e52ab4c50568ce (patch) | |
| tree | 987e07c8e5b6ca3d3db8ea2a900efcaa9d7bfa7d /init | |
| parent | 49ce750e62043254457a09a99316fc6a90b309f3 (diff) | |
| parent | 65e709dc0c25dbd563861924815e9a3a93878b75 (diff) | |
manual merge of timers/nohz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 | ||||
| -rw-r--r-- | init/main.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4367e1379002..ec3cb7bd085d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -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 diff --git a/init/main.c b/init/main.c index d9c02e1168f3..a2393be7b9e3 100644 --- a/init/main.c +++ b/init/main.c @@ -546,6 +546,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(); |