sched: Move wq_worker_waking to the correct site
Commit-ID: c2f7115e2e52a6c187b8c1f54f0e4970bb677be0 Gitweb: http://git.kernel.org/tip/c2f7115e2e52a6c187b8c1f54f0e4970bb677be0 Author: Peter Zijlstra <[email protected]> AuthorDate: Wed, 13 Apr 2011 13:28:56 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 14 Apr 2011 08:52:33 +0200
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 Peter Zijlstra <[email protected]>
Cc Tejun Heo <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/sched.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
kernel/sched.c +4 -3
@@ -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)); }/**
Quoted 3 lines · tip-bot for Peter Zijlstra
Message-ID: <[email protected]>
hpa, that Link: magic doesn't appear to have done the trick..
Quoted 5 lines · Peter Zijlstra
Quoted 2 lines
Link:
http://lkml.kernel.org/n/[email protected]
hpa, that Link: magic doesn't appear to have done the trick..
Damn, I fat fingered things.. I wrote n/top-
/me goes fix