summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 15:44:12 +0000
committerArnd Bergmann <arnd@arndb.de>2012-10-07 10:33:07 +0200
commite7215fb33acfba65f0a83a2cf3c58c529e042078 (patch)
treed168f6f63e6b8ef3d31cb01f4cb009e4cc0b52a5
parent673550a19f01c7955a1321ed9f43a4e2fd9cabf6 (diff)
downloadlinux-3.10-e7215fb33acfba65f0a83a2cf3c58c529e042078.tar.gz
linux-3.10-e7215fb33acfba65f0a83a2cf3c58c529e042078.tar.bz2
linux-3.10-e7215fb33acfba65f0a83a2cf3c58c529e042078.zip
ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok
The sys_timer init function is only called at __init time, so it's safe to mark mv78xx0_timer_init as __init_refok, which allows us to call orion_time_init without getting a link time warning. Without this patch, building mv78xx0_defconfig results in: WARNING: vmlinux.o(.text+0x15470): Section mismatch in reference from the function mv78xx0_timer_init() to the function .init.text:orion_time_init() The function mv78xx0_timer_init() references the function __init orion_time_init(). This is often because mv78xx0_timer_init lacks a __init annotation or the annotation of orion_time_init is wrong. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch>
-rw-r--r--arch/arm/mach-mv78xx0/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 3057f7d4329..e251ebc7228 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -341,7 +341,7 @@ void __init mv78xx0_init_early(void)
orion_time_set_base(TIMER_VIRT_BASE);
}
-static void mv78xx0_timer_init(void)
+static void __init_refok mv78xx0_timer_init(void)
{
orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
IRQ_MV78XX0_TIMER_1, get_tclk());