diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-23 22:36:35 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-09 17:27:01 +0200 |
| commit | b3796d92086ecea4c4825fa232da60b6d6f354af (patch) | |
| tree | e3543efcfecb98eb4fe54402b205988993dcaa1d /arch/arm/mach-shmobile | |
| parent | 096947fdab96fd97df47b10b8547382290ef9fcd (diff) | |
| download | blackbird-op-linux-b3796d92086ecea4c4825fa232da60b6d6f354af.tar.gz blackbird-op-linux-b3796d92086ecea4c4825fa232da60b6d6f354af.zip | |
ARM: shmobile: mark shmobile_init_late as __init
Patch 35f2b0bd59 "ARM: shmobile: Move definition of shmobile_init_late()
to header" moved the definition of the shmobile_init_late function, but
dropped the __init annotation, which is now causing warnings because
the function calls shmobile_suspend_init, which is also marked init.
Without this patch, building kota2_defconfig results in:
WARNING: vmlinux.o(.text+0xb7c8): Section mismatch in reference from the function shmobile_init_late() to the function .init.text:shmobile_suspend_init()
The function shmobile_init_late() references
the function __init shmobile_suspend_init().
This is often because shmobile_init_late lacks a __init
annotation or the annotation of shmobile_suspend_init is wrong.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Magnus Damm <damm@opensource.se>
Cc: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index ed77ab8c9143..d47e215aca87 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -100,7 +100,7 @@ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; } extern void shmobile_smp_init_cpus(unsigned int ncores); -static inline void shmobile_init_late(void) +static inline void __init shmobile_init_late(void) { shmobile_suspend_init(); shmobile_cpuidle_init(); |
