Merge commit 'v2.6.37-rc7' into perf/core

[firefly-linux-kernel-4.4.55.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 297d1a0eedb0e68d8b9327f530ba477c93b1222e..c68cead94dd76942beeffa932498d0ae5a2cfe41 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8293,8 +8293,6 @@ void __init sched_init(void)
                zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
 #endif /* SMP */
 
-       perf_event_init();
-
        scheduler_running = 1;
 }