From 647ee453280cce1f1a7f4cb9fa6c5d4c531fdbdb Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <js1304@gmail.com>
Date: Wed, 15 Aug 2012 23:25:38 +0900
Subject: [PATCH] --- yaml --- r: 327167 b: refs/heads/master c:
 e42986de481238204f6e0b0f4434da428895c20b h: refs/heads/master i:   327165:
 817222a363c03b00401f874d682beafea34d499c   327163:
 72b20b59b0d429b6dfa88752e5d7c6cd520ce94e   327159:
 d98a33903f1037b87d113b8c5b12df0ccbf58bbb   327151:
 72b80f803e60520950ef786d5053467cdc676a3b   327135:
 bb65e8d43e2f049bd0db08a61888773a32b13c6d   327103:
 88dbcc53a3ea35f8fee2f998045200dd57a0d4b0   327039:
 0a2d715ffa2caaed8096749140fc2395ebc57f0f   326911:
 55f8f711838ed4d67f30ddf4f7d25a74015886a3   326655:
 4e221374f2bff633168a9e3b57d55f9afbf445df v: v3

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

diff --git a/[refs] b/[refs]
index d52eb3d61732..9334b01219a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b75cac9368fa91636e17d0f7950b35d837154e14
+refs/heads/master: e42986de481238204f6e0b0f4434da428895c20b
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index c29f2dc0f4fc..99ee9b939264 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -1356,9 +1356,15 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
 	if (!(wq->flags & WQ_UNBOUND)) {
 		struct global_cwq *gcwq = get_work_gcwq(work);
 
-		if (gcwq && gcwq->cpu != WORK_CPU_UNBOUND)
+		/*
+		 * If we cannot get the last gcwq from @work directly,
+		 * select the last CPU such that it avoids unnecessarily
+		 * triggering non-reentrancy check in __queue_work().
+		 */
+		lcpu = cpu;
+		if (gcwq)
 			lcpu = gcwq->cpu;
-		else
+		if (lcpu == WORK_CPU_UNBOUND)
 			lcpu = raw_smp_processor_id();
 	} else {
 		lcpu = WORK_CPU_UNBOUND;