Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...

[~andy/linux] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 388d9db044ab42c6e950de96c4298435c2d031b1..52490bf6b884ab2ce08d0235572c241704903e57 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5901,7 +5901,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_retfunc_init_task(idle);
+       ftrace_graph_init_task(idle);
 }
 
 /*