From c937ad2d507182f2f494f5aee04d57df4155773b Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 18 Sep 2012 09:59:23 -0700
Subject: [PATCH] --- yaml --- r: 327191 b: refs/heads/master c:
 a5b4e57d7cc07cb28ccf16de0876a4770ae84920 h: refs/heads/master i:   327189:
 647cfc580f0e74be1aa42d7316d578ee266de135   327187:
 4a6739d0ee3a22f13aa564274e651a47d7719074   327183:
 7a2f3e9dff1513c3fa0f3acd0f4e017a9be55fe5 v: v3

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

diff --git a/[refs] b/[refs]
index b3834f4c0c05..3bd24d37d811 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fdf9b73d61c87a9c16f101bb8bbe069d13046f5
+refs/heads/master: a5b4e57d7cc07cb28ccf16de0876a4770ae84920
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 942bb750a650..48becaba1c94 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -3807,7 +3807,7 @@ static int __init init_workqueues(void)
 		     WORK_CPU_LAST);
 
 	cpu_notifier(workqueue_cpu_up_callback, CPU_PRI_WORKQUEUE_UP);
-	cpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_DOWN);
+	hotcpu_notifier(workqueue_cpu_down_callback, CPU_PRI_WORKQUEUE_DOWN);
 
 	/* initialize gcwqs */
 	for_each_gcwq_cpu(cpu) {