---

yaml --- r: 316727 b: refs/heads/master c: 6fec10a h: refs/heads/master i: 316725: b75bcf3 316723: 8f373b3 316719: 831af94 v: v3
git-mirror · Jul 22, 2012 · 34da9f4 · 34da9f4
1 parent f23cd02
commit 34da9f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46f3d976213452350f9d10b0c2780c2681f7075b
+refs/heads/master: 6fec10a1a5866dda3cd6a825a521fc7c2f226ba5
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -1949,7 +1949,13 @@ __acquires(&gcwq->lock)
 
 	lockdep_copy_map(&lockdep_map, &work->lockdep_map);
 #endif
+	/*
+	 * Ensure we're on the correct CPU.  DISASSOCIATED test is
+	 * necessary to avoid spurious warnings from rescuers servicing the
+	 * unbound or a disassociated gcwq.
+	 */
 	WARN_ON_ONCE(!(worker->flags & (WORKER_UNBOUND | WORKER_REBIND)) &&
+		     !(gcwq->flags & GCWQ_DISASSOCIATED) &&
 		     raw_smp_processor_id() != gcwq->cpu);
 
 	/*