---

yaml --- r: 365532 b: refs/heads/master c: 519e3c1 h: refs/heads/master v: v3
git-mirror · Mar 20, 2013 · ebc83c2 · ebc83c2
1 parent 12186d2
commit ebc83c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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