---

yaml --- r: 327151 b: refs/heads/master c: 959d1af h: refs/heads/master i: 327149: 8fe290b 327147: 7620e4e 327143: cc2a4af 327135: bb65e8d v: v3
git-mirror · Aug 3, 2012 · 72b80f8 · 72b80f8
1 parent 6db619d
commit 72b80f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4283e9378619c14dc3826a6b0527eb5d967ffde
+refs/heads/master: 959d1af8cffc8fd38ed53e8be1cf4ab8782f9c00
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
@@ -1997,7 +1997,9 @@ __acquires(&gcwq->lock)
 
 	spin_unlock_irq(&gcwq->lock);
 
+	smp_wmb();	/* paired with test_and_set_bit(PENDING) */
 	work_clear_pending(work);
+
 	lock_map_acquire_read(&cwq->wq->lockdep_map);
 	lock_map_acquire(&lockdep_map);
 	trace_workqueue_execute_start(work);