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

Commit c2f7115e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched: Move wq_worker_waking to the correct site 



wq_worker_waking_up() needs to match wq_worker_sleeping(), since the
latter is only called on deactivate, move the former near activate.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/n/top-t3m7n70n9frmv4pv2n5fwmov@git.kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c6eb3dda

kernel/sched.c

+4 −3
Original line number Diff line number Diff line
@@ -2421,6 +2421,10 @@ static inline void ttwu_activate(struct task_struct *p, struct rq *rq, 
		schedstat_inc(p, se.statistics.nr_wakeups_remote);



	activate_task(rq, p, en_flags);



	/* if a worker is waking up, notify workqueue */

	if (p->flags & PF_WQ_WORKER)

		wq_worker_waking_up(p, cpu_of(rq));

}



static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq,
@@ -2445,9 +2449,6 @@ static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq, 
		rq->idle_stamp = 0;

	}

#endif

	/* if a worker is waking up, notify workqueue */

	if ((p->flags & PF_WQ_WORKER) && success)

		wq_worker_waking_up(p, cpu_of(rq));

}



/**