diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-06-06 19:37:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-06-06 19:37:51 -0400 |
| commit | fcffd50e9e4b4aece3f4e5557af81cb8aec0f88f (patch) | |
| tree | 0d91270a06322f8293086c791de0fe4113e84210 | |
| parent | 654662345feffc1d6996db2c7edbc64936b1feca (diff) | |
Revert "workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active"
This reverts commit 935055856458a05c43f518bf9ed406f67c090f0a.
Reported-by: Ibrahim Umar <iambaim@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/workqueue.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 418c3bc1c4f9..a08a9637f8b1 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1212,13 +1212,8 @@ static void worker_enter_idle(struct worker *worker) jiffies + IDLE_WORKER_TIMEOUT); } - /* - * Sanity check nr_running. Because trustee releases gcwq->lock - * between setting %WORKER_ROGUE and zapping nr_running, the - * warning may trigger spuriously. Check iff trustee is idle. - */ - WARN_ON_ONCE(gcwq->trustee_state == TRUSTEE_DONE && - gcwq->nr_workers == gcwq->nr_idle && + /* sanity check nr_running */ + WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle && atomic_read(get_gcwq_nr_running(gcwq->cpu))); } |