Merge branch 'tracing/fastboot' into cpus4096

2008-12-12 12:43:05 +01:00
parent a64d31baed da485e0cb1
commit 81444a7995
185 changed files with 5846 additions and 3016 deletions
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5893,7 +5893,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);
 }

 /*