From a82094e0a7e1e951e24bacc8b249871bfd6b6148 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 13 Feb 2013 22:49:04 +0100
Subject: [PATCH] --- yaml --- r: 355645 b: refs/heads/master c:
 b0db321ba14daca748d5c8ca89298fdb637f9ba8 h: refs/heads/master i:   355643:
 06205532600f413ede05b3ea03742b00a8eae6e0 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-prima2/headsmp.S | 3 ++-
 trunk/arch/arm/mach-prima2/hotplug.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 75cad799b37c..c655f7f8ee85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c75c4210009d5cceced76af316c51f9e56ce630
+refs/heads/master: b0db321ba14daca748d5c8ca89298fdb637f9ba8
diff --git a/trunk/arch/arm/mach-prima2/headsmp.S b/trunk/arch/arm/mach-prima2/headsmp.S
index 6ec19d51a271..ada82d0917ef 100644
--- a/trunk/arch/arm/mach-prima2/headsmp.S
+++ b/trunk/arch/arm/mach-prima2/headsmp.S
@@ -9,7 +9,8 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
-	__INIT
+	__CPUINIT
+
 /*
  * Cold boot and hardware reset show different behaviour,
  * system will be always panic if we warm-reset the board
diff --git a/trunk/arch/arm/mach-prima2/hotplug.c b/trunk/arch/arm/mach-prima2/hotplug.c
index 97c1ee586442..f4b17cbababd 100644
--- a/trunk/arch/arm/mach-prima2/hotplug.c
+++ b/trunk/arch/arm/mach-prima2/hotplug.c
@@ -35,7 +35,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
  *
  * Called with IRQs disabled
  */
-void sirfsoc_cpu_die(unsigned int cpu)
+void __ref sirfsoc_cpu_die(unsigned int cpu)
 {
 	platform_do_lowpower(cpu);
 }