aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-11-17 17:17:33 -0500
committerIngo Molnar <mingo@elte.hu>2010-12-16 05:36:42 -0500
commit24a24bb6ff3dc3a09bb131241be920ecc3f0e519 (patch)
tree181eca7d23ba93af11304683a309e18b697a15b0
parent4407204c5c9037763aadce39b025529dfbfcac9e (diff)
perf: Move perf_event_init() into main.c
Currently we call perf_event_init() from sched_init(). In order to make it more obvious move it to the cannnonical location. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <20101117222056.093629821@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--init/main.c2
-rw-r--r--kernel/sched.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c
index 261ad7b3fe0b..559e86286500 100644
--- a/init/main.c
+++ b/init/main.c
@@ -67,6 +67,7 @@
67#include <linux/sfi.h> 67#include <linux/sfi.h>
68#include <linux/shmem_fs.h> 68#include <linux/shmem_fs.h>
69#include <linux/slab.h> 69#include <linux/slab.h>
70#include <linux/perf_event.h>
70 71
71#include <asm/io.h> 72#include <asm/io.h>
72#include <asm/bugs.h> 73#include <asm/bugs.h>
@@ -603,6 +604,7 @@ asmlinkage void __init start_kernel(void)
603 "enabled *very* early, fixing it\n"); 604 "enabled *very* early, fixing it\n");
604 local_irq_disable(); 605 local_irq_disable();
605 } 606 }
607 perf_event_init();
606 rcu_init(); 608 rcu_init();
607 radix_tree_init(); 609 radix_tree_init();
608 /* init some links before init_ISA_irqs() */ 610 /* init some links before init_ISA_irqs() */
diff --git a/kernel/sched.c b/kernel/sched.c
index dc91a4d09ac3..605ab1b24d81 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -8108,8 +8108,6 @@ void __init sched_init(void)
8108 zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); 8108 zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
8109#endif /* SMP */ 8109#endif /* SMP */
8110 8110
8111 perf_event_init();
8112
8113 scheduler_running = 1; 8111 scheduler_running = 1;
8114} 8112}
8115 8113