From ebc83c202d549379239221d5549fb4800ce9903e Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 20 Mar 2013 03:28:21 +0800
Subject: [PATCH] --- yaml --- r: 365532 b: refs/heads/master c:
 519e3c1163ce2b2d510b76b0f5b374198f9378f3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f60e3436451..5a2c3b87de64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881094532e2a27406a5f06f839087bd152a8a494
+refs/heads/master: 519e3c1163ce2b2d510b76b0f5b374198f9378f3
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index b6c5a524d7c4..47f258799bf2 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -305,7 +305,8 @@ static void copy_workqueue_attrs(struct workqueue_attrs *to,
 
 #ifdef CONFIG_LOCKDEP
 #define assert_manager_or_pool_lock(pool)				\
-	WARN_ONCE(!lockdep_is_held(&(pool)->manager_mutex) &&		\
+	WARN_ONCE(debug_locks &&					\
+		  !lockdep_is_held(&(pool)->manager_mutex) &&		\
 		  !lockdep_is_held(&(pool)->lock),			\
 		  "pool->manager_mutex or ->lock should be held")
 #else