diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 15:15:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 15:15:16 +0100 |
commit | bf1af3a809506645b9130755b713b008da14737f (patch) | |
tree | 6a13f9c622fa8322a6ca2795bd7bb4e9f8fd6160 /kernel/sched.c | |
parent | 0de4b34d466bae571b50f41c7296b85248205e35 (diff) | |
parent | 868baf07b1a259f5f3803c1dc2777b6c358f83cf (diff) | |
download | op-kernel-dev-bf1af3a809506645b9130755b713b008da14737f.zip op-kernel-dev-bf1af3a809506645b9130755b713b008da14737f.tar.gz |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 31cb5d5..e142e92 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5550,7 +5550,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu) * The idle tasks have their own, simple scheduling class: */ idle->sched_class = &idle_sched_class; - ftrace_graph_init_task(idle); + ftrace_graph_init_idle_task(idle, cpu); } /* |