From 7478a9d0ab0526e31bea581cf5edf31c7f9073c6 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Thu, 4 Apr 2013 10:05:38 +0800
Subject: [PATCH] --- yaml --- r: 365557 b: refs/heads/master c:
 5c529597e922c26910fe49b8d5f93aeaca9a2415 h: refs/heads/master i:   365555:
 566613931330a4c2a31b32554b4a71adf16f7812 v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/workqueue.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3d54aa2246f7..623403adc1b5 100644
--- 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
index dd2a4c49a39a..c273376ff73e 100644
--- 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);