diff --git a/[refs] b/[refs] index 146ca4f61e3d..2dd50a281552 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4407204c5c9037763aadce39b025529dfbfcac9e +refs/heads/master: 24a24bb6ff3dc3a09bb131241be920ecc3f0e519 diff --git a/trunk/init/main.c b/trunk/init/main.c index 261ad7b3fe0b..559e86286500 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include @@ -603,6 +604,7 @@ asmlinkage void __init start_kernel(void) "enabled *very* early, fixing it\n"); local_irq_disable(); } + perf_event_init(); rcu_init(); radix_tree_init(); /* init some links before init_ISA_irqs() */ diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index dc91a4d09ac3..605ab1b24d81 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8108,8 +8108,6 @@ void __init sched_init(void) zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); #endif /* SMP */ - perf_event_init(); - scheduler_running = 1; }