Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index bb1aed928f21391b63493112c6bb1a1eae39077f..c5c11da6c4e15ef6ede067a7bfdcf34e8fce34ad 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -577,13 +577,13 @@ asmlinkage __visible void __init start_kernel(void)
                local_irq_disable();
        idr_init_cache();
        rcu_init();
-       tick_nohz_init();
        context_tracking_init();
        radix_tree_init();
        /* init some links before init_ISA_irqs() */
        early_irq_init();
        init_IRQ();
        tick_init();
+       rcu_init_nohz();
        init_timers();
        hrtimers_init();
        softirq_init();