---

yaml --- r: 223921 b: refs/heads/master c: 24a24bb h: refs/heads/master i: 223919: 458bd53 v: v3
git-mirror · Dec 16, 2010 · 365ab57 · 365ab57
1 parent c77d142
commit 365ab57
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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,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
@@ -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;
 }