From 918c55442438af739f22864eb5ba8275d8a18e53 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Wed, 19 Sep 2012 10:40:48 -0700
Subject: [PATCH] --- yaml --- r: 327195 b: refs/heads/master c:
 70369b117a8fc5ac18a635ced23ee49f8e722e7b h: refs/heads/master i:   327193:
 c5eca9267d75d25029005511cce732aa4af6a945   327191:
 c937ad2d507182f2f494f5aee04d57df4155773b v: v3

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

diff --git a/[refs] b/[refs]
index d5abe86b3ac0..ea2b2c508215 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f4bd4cddbb50d7617353102e10ce511c5ef6df2
+refs/heads/master: 70369b117a8fc5ac18a635ced23ee49f8e722e7b
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index b5d722548ffd..4f5c61f8b0e7 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -3413,7 +3413,7 @@ void workqueue_set_max_active(struct workqueue_struct *wq, int max_active)
 
 		if (!(wq->flags & WQ_FREEZABLE) ||
 		    !(gcwq->flags & GCWQ_FREEZING))
-			get_cwq(gcwq->cpu, wq)->max_active = max_active;
+			cwq_set_max_active(get_cwq(gcwq->cpu, wq), max_active);
 
 		spin_unlock_irq(&gcwq->lock);
 	}