From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Mon, 12 May 2008 19:20:53 +0000 (+0200)
Subject: ftrace: fix wakeup callback
X-Git-Tag: v2.6.27-rc1~1102^2^2~1^2~77
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5429db2d26a59903c81a4f6c6dae7eb9daaea5fc;p=linux-block.git

ftrace: fix wakeup callback

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 3bc7c5362998..1ec3fb2efee6 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -2533,7 +2533,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
 
 out_activate:
 #endif /* CONFIG_SMP */
-	ftrace_wake_up_task(rq, p, rq->curr);
 	schedstat_inc(p, se.nr_wakeups);
 	if (sync)
 		schedstat_inc(p, se.nr_wakeups_sync);
@@ -2548,6 +2547,7 @@ out_activate:
 	success = 1;
 
 out_running:
+	ftrace_wake_up_task(rq, p, rq->curr);
 	check_preempt_curr(rq, p);
 
 	p->state = TASK_RUNNING;