Merge tag 'mfd-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[linux-block.git] / kernel / workqueue.c

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 471996a816339c54032602def2c7b8a1eb40c6d2..692d97628a106360683dfef46797952cdf1861e1 100644 (file)
--- a/kernel/workqueue.c
+++ b/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);
 
        /*