Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5429db2d authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

ftrace: fix wakeup callback 



Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bac524d3

kernel/sched.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync) 
	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;