diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-06-07 07:56:08 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-06-07 07:56:08 -0400 |
| commit | 390db7a07ce27fb8f51611b8b6fcfe0e104bf1f5 (patch) | |
| tree | 9ee398a4e8d6438e9456b672eb56ca7bb9c07084 | |
| parent | 2220bf75538d47a5f157234a60c52a96f8f6efb1 (diff) | |
Revert "workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is active"
This reverts commit 24312d34c95702e51240f58c073db30630170fbf.
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 f8d81831f5b0..bc867e8c5ca9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1208,13 +1208,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))); } |