Merge branch 'socfpga/dt' into next/dt

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index bef4a6ac7c76dd62ad6339fd5a11b81b87c79009..d03d2ec2eacfd351241af097f6402cf9b509e8e5 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -543,7 +543,6 @@ 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();
@@ -557,6 +556,7 @@ asmlinkage void __init start_kernel(void)
        timekeeping_init();
        time_init();
        sched_clock_postinit();
+       perf_event_init();
        profile_init();
        call_function_init();
        WARN(!irqs_disabled(), "Interrupts were enabled early\n");
@@ -657,8 +657,6 @@ static void __init do_ctors(void)
 bool initcall_debug;
 core_param(initcall_debug, initcall_debug, bool, 0644);
 
-static char msgbuf[64];
-
 static int __init_or_module do_one_initcall_debug(initcall_t fn)
 {
        ktime_t calltime, delta, rettime;
@@ -681,6 +679,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
 {
        int count = preempt_count();
        int ret;
+       char msgbuf[64];
 
        if (initcall_debug)
                ret = do_one_initcall_debug(fn);