summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-13 22:49:04 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-14 14:36:35 +0100
commitb0db321ba14daca748d5c8ca89298fdb637f9ba8 (patch)
tree63bd95ccf4d5e9577cfed5da651ff9cedb675d0b
parent1c75c4210009d5cceced76af316c51f9e56ce630 (diff)
downloadlinux-b0db321ba14daca748d5c8ca89298fdb637f9ba8.tar.bz2
ARM: prima2: fix __init section for cpu hotplug
The code in arch/arm/mach-prima2/headsmp.S is used for both boot time initialization and for cpu hotplug, so it must not be discarded after the initial boot is complete. This replaces the __INIT annotation with __CPUINIT, and marks the sirfsoc_cpu_die as __ref to annotate that it correctly uses the sections. Without this patch, building prima2_defconfig results in: WARNING: arch/arm/mach-prima2/built-in.o(.cpuinit.text+0x130): Section mismatch in reference from the function sirfsoc_boot_secondary() to the function .init.text:sirfsoc_secondary_startup() The function __cpuinit sirfsoc_boot_secondary() references a function __init sirfsoc_secondary_startup(). If sirfsoc_secondary_startup is only used by sirfsoc_boot_secondary then annotate sirfsoc_secondary_startup with a matching annotation. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Barry Song <baohua.song@csr.com>
-rw-r--r--arch/arm/mach-prima2/headsmp.S3
-rw-r--r--arch/arm/mach-prima2/hotplug.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S
index 6ec19d51a271..ada82d0917ef 100644
--- a/arch/arm/mach-prima2/headsmp.S
+++ b/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/arch/arm/mach-prima2/hotplug.c b/arch/arm/mach-prima2/hotplug.c
index 97c1ee586442..f4b17cbababd 100644
--- a/arch/arm/mach-prima2/hotplug.c
+++ b/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);
}