summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-05-12 21:20:53 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 21:09:02 +0200
commit5429db2d26a59903c81a4f6c6dae7eb9daaea5fc (patch)
treefb3319487fd29f04cc51107e953aacb6a0647b6d /kernel/sched.c
parentbac524d3f3dfeffa3a9d44f2c64035b88bcaacb4 (diff)
downloadop-kernel-dev-5429db2d26a59903c81a4f6c6dae7eb9daaea5fc.zip
op-kernel-dev-5429db2d26a59903c81a4f6c6dae7eb9daaea5fc.tar.gz
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>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 3bc7c53..1ec3fb2 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;
OpenPOWER on IntegriCloud