From 8a89fa1de94854382384aa5b7d8b2f12c9dc6f46 Mon Sep 17 00:00:00 2001
From: Fenghua Yu <fenghua.yu@intel.com>
Date: Tue, 15 Nov 2011 21:59:31 +0100
Subject: [PATCH] --- yaml --- r: 280346 b: refs/heads/master c:
 d7268a31c8aabc5a29ccc7f76de84383e5f38737 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b8b1fabaa15d..8b1b3739a43f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5307427a31c50041cc4d18c49e9cce1a9303ea04
+refs/heads/master: d7268a31c8aabc5a29ccc7f76de84383e5f38737
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
index 563f13609470..cf915b86a5fb 100644
--- a/trunk/kernel/cpu.c
+++ b/trunk/kernel/cpu.c
@@ -470,7 +470,7 @@ void __ref enable_nonboot_cpus(void)
 	cpu_maps_update_done();
 }
 
-static int alloc_frozen_cpus(void)
+static int __init alloc_frozen_cpus(void)
 {
 	if (!alloc_cpumask_var(&frozen_cpus, GFP_KERNEL|__GFP_ZERO))
 		return -ENOMEM;
@@ -543,7 +543,7 @@ cpu_hotplug_pm_callback(struct notifier_block *nb,
 }
 
 
-int cpu_hotplug_pm_sync_init(void)
+static int __init cpu_hotplug_pm_sync_init(void)
 {
 	pm_notifier(cpu_hotplug_pm_callback, 0);
 	return 0;