Skip to content

Commit

Permalink
perf: Move perf_event_init() into main.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Dec 16, 2010
1 parent 4407204 commit 24a24bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 2 additions & 0 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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() */
Expand Down
2 changes: 0 additions & 2 deletions kernel/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 24a24bb

Please sign in to comment.