FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-30 05:15:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: prima2: fix __init section for cpu hotplug

Browse Source 
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>
This commit is contained in:
Arnd Bergmann 2013-02-13 22:49:04 +01:00
parent 1c75c42100
commit b0db321ba1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-prima2/headsmp.S
View File

@ -9,7 +9,8 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/init.h> #include <linux/init.h>
__INIT __CPUINIT
/* /*
* Cold boot and hardware reset show different behaviour, * Cold boot and hardware reset show different behaviour,
* system will be always panic if we warm-reset the board * system will be always panic if we warm-reset the board

2
arch/arm/mach-prima2/hotplug.c
View File

@ -35,7 +35,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
* *
* Called with IRQs disabled * Called with IRQs disabled
*/ */
void sirfsoc_cpu_die(unsigned int cpu) void __ref sirfsoc_cpu_die(unsigned int cpu)
{ {
platform_do_lowpower(cpu); platform_do_lowpower(cpu);
} }