perf/x86/intel: Move NMI clearing to end of PMI handler

[deliverable/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index ceed17aaedfd8393d0a2dabc7849cd2871a4f38d..ec549581d732f633ca002c823a38ed15a6d31a60 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -542,8 +542,8 @@ asmlinkage void __init start_kernel(void)
        if (WARN(!irqs_disabled(), "Interrupts were enabled *very* early, fixing it\n"))
                local_irq_disable();
        idr_init_cache();
-       perf_event_init();
        rcu_init();
+       tick_nohz_init();
        radix_tree_init();
        /* init some links before init_ISA_irqs() */
        early_irq_init();
@@ -554,6 +554,7 @@ asmlinkage void __init start_kernel(void)
        softirq_init();
        timekeeping_init();
        time_init();
+       perf_event_init();
        profile_init();
        call_function_init();
        WARN(!irqs_disabled(), "Interrupts were enabled early\n");