From 171eaac780218b6dcc6647f5208cc56efc524106 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: 327190 b: refs/heads/master c:
 9fdf9b73d61c87a9c16f101bb8bbe069d13046f5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0bf4ff8aeea1..b3834f4c0c05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2eb83d123c1cc9f96a8e452b26a6ebe631b3ad7
+refs/heads/master: 9fdf9b73d61c87a9c16f101bb8bbe069d13046f5
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index e651239f1ece..942bb750a650 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -3548,7 +3548,7 @@ static void gcwq_unbind_fn(struct work_struct *work)
  * Workqueues should be brought up before normal priority CPU notifiers.
  * This will be registered high priority CPU notifier.
  */
-static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb,
+static int __cpuinit workqueue_cpu_up_callback(struct notifier_block *nfb,
 					       unsigned long action,
 					       void *hcpu)
 {
@@ -3589,7 +3589,7 @@ static int __devinit workqueue_cpu_up_callback(struct notifier_block *nfb,
  * Workqueues should be brought down after normal priority CPU notifiers.
  * This will be registered as low priority CPU notifier.
  */
-static int __devinit workqueue_cpu_down_callback(struct notifier_block *nfb,
+static int __cpuinit workqueue_cpu_down_callback(struct notifier_block *nfb,
 						 unsigned long action,
 						 void *hcpu)
 {