From 55d82106ff71e0e6a88acd12f23c4909773aa51a Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 13 Apr 2011 13:28:56 +0200 Subject: [PATCH] --- yaml --- r: 245572 b: refs/heads/master c: c2f7115e2e52a6c187b8c1f54f0e4970bb677be0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1639be398dbe..dde6f573e71f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6eb3dda25892f1f974f5420f63e6721aab02f6f +refs/heads/master: c2f7115e2e52a6c187b8c1f54f0e4970bb677be0 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 55cc50323ce1..81ab58efd788 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -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)); } /**