lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: fix wakeup callback

Browse Source 
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>
This commit is contained in:
Peter Zijlstra
2008-05-12 21:20:53 +02:00
committed by Thomas Gleixner
parent bac524d3f3
commit 5429db2d26
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/sched.c
View File

@@ -2533,7 +2533,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
out_activate: out_activate:
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
ftrace_wake_up_task(rq, p, rq->curr);
schedstat_inc(p, se.nr_wakeups); schedstat_inc(p, se.nr_wakeups);
if (sync) if (sync)
schedstat_inc(p, se.nr_wakeups_sync); schedstat_inc(p, se.nr_wakeups_sync);
@@ -2548,6 +2547,7 @@ out_activate:
success = 1; success = 1;
out_running: out_running:
ftrace_wake_up_task(rq, p, rq->curr);
check_preempt_curr(rq, p); check_preempt_curr(rq, p);
p->state = TASK_RUNNING; p->state = TASK_RUNNING;