From 72b80f803e60520950ef786d5053467cdc676a3b Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 3 Aug 2012 10:30:45 -0700
Subject: [PATCH] --- yaml --- r: 327151 b: refs/heads/master c:
 959d1af8cffc8fd38ed53e8be1cf4ab8782f9c00 h: refs/heads/master i:   327149:
 8fe290b038e9147f5de5f02ed4f5256b3fca6a36   327147:
 7620e4ef793627be1e2bcb5334c09e19b5a116b2   327143:
 cc2a4af711f113edcc03eab63f41c7fc21eaa4a4   327135:
 bb65e8d43e2f049bd0db08a61888773a32b13c6d v: v3

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

diff --git a/[refs] b/[refs]
index 702107bedd79..f01e4b356a7f 100644
--- 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
index 70f95ab28f3d..5c26d36146b7 100644
--- 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);