---

yaml --- r: 355645 b: refs/heads/master c: b0db321 h: refs/heads/master i: 355643: 0620553 v: v3
git-mirror · Feb 14, 2013 · a82094e · a82094e
1 parent aeff5c9
commit a82094e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);
 }