Commit-ID: 24a24bb6ff3dc3a09bb131241be920ecc3f0e519 Gitweb: http://git.kernel.org/tip/24a24bb6ff3dc3a09bb131241be920ecc3f0e519 Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> AuthorDate: Wed, 17 Nov 2010 23:17:33 +0100 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Thu, 16 Dec 2010 11:36:42 +0100 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@xxxxxxxxx> LKML-Reference: <20101117222056.093629821@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- init/main.c | 2 ++ kernel/sched.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/init/main.c b/init/main.c index 261ad7b..559e862 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() */ diff --git a/kernel/sched.c b/kernel/sched.c index dc91a4d..605ab1b 100644 --- a/kernel/sched.c +++ b/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; } -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|