1 files changed, 4 insertions, 4 deletions

diff --git a/init/main.c b/init/main.c
index 8646401f7a0e..00799c1d4628 100644
--- a/init/main.c
+++ b/init/main.c
@@ -67,6 +67,7 @@
 #include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
+#include <linux/perf_event.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -603,6 +604,8 @@ asmlinkage void __init start_kernel(void)
                                 "enabled *very* early, fixing it\n");
                 local_irq_disable();
         }
+        idr_init_cache();
+        perf_event_init();
         rcu_init();
         radix_tree_init();
         /* init some links before init_ISA_irqs() */
@@ -658,7 +661,6 @@ asmlinkage void __init start_kernel(void)
         enable_debug_pagealloc();
         kmemleak_init();
         debug_objects_mem_init();
-        idr_init_cache();
         setup_per_cpu_pageset();
         numa_policy_init();
         if (late_time_init)
@@ -775,9 +777,6 @@ static void __init do_initcalls(void)
 
         for (fn = __early_initcall_end; fn < __initcall_end; fn++)
                 do_one_initcall(*fn);
-
-        /* Make sure there is no pending stuff from the initcall sequence */
-        flush_scheduled_work();
 }
 
 /*
@@ -882,6 +881,7 @@ static int __init kernel_init(void * unused)
         smp_prepare_cpus(setup_max_cpus);
 
         do_pre_smp_initcalls();
+        lockup_detector_init();
 
         smp_init();
         sched_init_smp();