---

yaml --- r: 365557 b: refs/heads/master c: 5c52959 h: refs/heads/master i: 365555: 5666139 v: v3
git-mirror · Apr 4, 2013 · 7478a9d · 7478a9d
1 parent adddc48
commit 7478a9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 229641a6f1f09e27a1f12fba38980f33f4c92975
+refs/heads/master: 5c529597e922c26910fe49b8d5f93aeaca9a2415
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -4201,7 +4201,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
 			}
 		}
 
-		if (WARN_ON(pwq->refcnt > 1) ||
+		if (WARN_ON((pwq != wq->dfl_pwq) && (pwq->refcnt > 1)) ||
 		    WARN_ON(pwq->nr_active) ||
 		    WARN_ON(!list_empty(&pwq->delayed_works))) {
 			mutex_unlock(&wq->mutex);