From 6d2c682f982b2bdc5270c19d7e7d78015deb0fba Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 12 Mar 2013 11:30:04 -0700
Subject: [PATCH] --- yaml --- r: 365503 b: refs/heads/master c:
 618b01eb426dd2d73a4b5e5ebc6379e4eee3b123 h: refs/heads/master i:   365501:
 f1e1d02068939f7a9b1df06399aef17d14934b5a   365499:
 983301eff8cddae2ce6d76ab7c822ab4e637f7d2   365495:
 0dbcd85746d2237bb5c9aeb2f4fe38fcf2f972e1   365487:
 1a9a5a73c9896e76fe2d96d4438da4bd75340b62   365471:
 b528e8f1a0e3a22f377eeca307885b691963ea97   365439:
 1317529c9c19485b3aa0db74e689f98985fb35e9 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/workqueue.h | 2 +-
 trunk/kernel/workqueue.c        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3bfc64b7bee5..9f3d75708b59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e8cd2f5898ab6710ad81f4583fada08bf8049a4
+refs/heads/master: 618b01eb426dd2d73a4b5e5ebc6379e4eee3b123
diff --git a/trunk/include/linux/workqueue.h b/trunk/include/linux/workqueue.h
index e152394fa7eb..1751ec4c47c9 100644
--- a/trunk/include/linux/workqueue.h
+++ b/trunk/include/linux/workqueue.h
@@ -294,7 +294,7 @@ enum {
 	WQ_HIGHPRI		= 1 << 4, /* high priority */
 	WQ_CPU_INTENSIVE	= 1 << 5, /* cpu instensive workqueue */
 
-	WQ_DRAINING		= 1 << 6, /* internal: workqueue is draining */
+	__WQ_DRAINING		= 1 << 16, /* internal: workqueue is draining */
 
 	WQ_MAX_ACTIVE		= 512,	  /* I like 512, better ideas? */
 	WQ_MAX_UNBOUND_PER_CPU	= 4,	  /* 4 * #cpus for unbound wq */
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 2a67fbbd192c..590f4d048ec7 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -1225,7 +1225,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
 	debug_work_activate(work);
 
 	/* if dying, only works from the same workqueue are allowed */
-	if (unlikely(wq->flags & WQ_DRAINING) &&
+	if (unlikely(wq->flags & __WQ_DRAINING) &&
 	    WARN_ON_ONCE(!is_chained_work(wq)))
 		return;
 retry:
@@ -2763,11 +2763,11 @@ void drain_workqueue(struct workqueue_struct *wq)
 	/*
 	 * __queue_work() needs to test whether there are drainers, is much
 	 * hotter than drain_workqueue() and already looks at @wq->flags.
-	 * Use WQ_DRAINING so that queue doesn't have to check nr_drainers.
+	 * Use __WQ_DRAINING so that queue doesn't have to check nr_drainers.
 	 */
 	spin_lock_irq(&workqueue_lock);
 	if (!wq->nr_drainers++)
-		wq->flags |= WQ_DRAINING;
+		wq->flags |= __WQ_DRAINING;
 	spin_unlock_irq(&workqueue_lock);
 reflush:
 	flush_workqueue(wq);
@@ -2795,7 +2795,7 @@ void drain_workqueue(struct workqueue_struct *wq)
 
 	spin_lock(&workqueue_lock);
 	if (!--wq->nr_drainers)
-		wq->flags &= ~WQ_DRAINING;
+		wq->flags &= ~__WQ_DRAINING;
 	spin_unlock(&workqueue_lock);
 
 	local_irq_enable();