From f5c58defd3eb4fb40206c6fdf5adc2200ec2c03c Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 1 Apr 2013 11:23:35 -0700
Subject: [PATCH] --- yaml --- r: 365551 b: refs/heads/master c:
 e50aba9aea63b7617887b4d9694184f478731c82 h: refs/heads/master i:   365549:
 4d72f171dd925a5ae8333f3fd5de7aa470c372e9   365547:
 2f07920e611f609e1a5bf15502778d792c89e77e   365543:
 f714cc322a6247f970f03716bf4af104a11b0188   365535:
 2dea5cae251f64d68ee8afdd4e1e742b7781353f v: v3

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

diff --git a/[refs] b/[refs]
index 630b2ffe2f81..6cd0a8e0c451 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f147f29eb7c4959e5f8be604ce2d23979c86378c
+refs/heads/master: e50aba9aea63b7617887b4d9694184f478731c82
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index c8d047b6c895..07ec57459457 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -3626,12 +3626,14 @@ static void pwq_adjust_max_active(struct pool_workqueue *pwq)
 	spin_unlock_irq(&pwq->pool->lock);
 }
 
-/* initialize newly zalloced @pwq which is associated with @wq and @pool */
+/* initialize newly alloced @pwq which is associated with @wq and @pool */
 static void init_pwq(struct pool_workqueue *pwq, struct workqueue_struct *wq,
 		     struct worker_pool *pool)
 {
 	BUG_ON((unsigned long)pwq & WORK_STRUCT_FLAG_MASK);
 
+	memset(pwq, 0, sizeof(*pwq));
+
 	pwq->pool = pool;
 	pwq->wq = wq;
 	pwq->flush_color = -1;
@@ -3677,7 +3679,7 @@ static struct pool_workqueue *alloc_unbound_pwq(struct workqueue_struct *wq,
 	if (!pool)
 		return NULL;
 
-	pwq = kmem_cache_zalloc(pwq_cache, GFP_KERNEL);
+	pwq = kmem_cache_alloc_node(pwq_cache, GFP_KERNEL, pool->node);
 	if (!pwq) {
 		put_unbound_pool(pool);
 		return NULL;