aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-05-12 15:20:53 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 15:09:02 -0400
commit5429db2d26a59903c81a4f6c6dae7eb9daaea5fc (patch)
treefb3319487fd29f04cc51107e953aacb6a0647b6d /kernel/sched.c
parentbac524d3f3dfeffa3a9d44f2c64035b88bcaacb4 (diff)
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 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)
2533 2533
2534out_activate: 2534out_activate:
2535#endif /* CONFIG_SMP */ 2535#endif /* CONFIG_SMP */
2536 ftrace_wake_up_task(rq, p, rq->curr);
2537 schedstat_inc(p, se.nr_wakeups); 2536 schedstat_inc(p, se.nr_wakeups);
2538 if (sync) 2537 if (sync)
2539 schedstat_inc(p, se.nr_wakeups_sync); 2538 schedstat_inc(p, se.nr_wakeups_sync);
@@ -2548,6 +2547,7 @@ out_activate:
2548 success = 1; 2547 success = 1;
2549 2548
2550out_running: 2549out_running:
2550 ftrace_wake_up_task(rq, p, rq->curr);
2551 check_preempt_curr(rq, p); 2551 check_preempt_curr(rq, p);
2552 2552
2553 p->state = TASK_RUNNING; 2553 p->state = TASK_RUNNING;