summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-11-17 23:17:33 +0100
committerIngo Molnar <mingo@elte.hu>2010-12-16 11:36:42 +0100
commit24a24bb6ff3dc3a09bb131241be920ecc3f0e519 (patch)
tree181eca7d23ba93af11304683a309e18b697a15b0 /init/main.c
parent4407204c5c9037763aadce39b025529dfbfcac9e (diff)
downloadlinux-24a24bb6ff3dc3a09bb131241be920ecc3f0e519.tar.gz
linux-24a24bb6ff3dc3a09bb131241be920ecc3f0e519.tar.bz2
linux-24a24bb6ff3dc3a09bb131241be920ecc3f0e519.zip
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>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c2
1 files changed, 2 insertions, 0 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 @@
#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() */