summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-09-15 21:42:59 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-09-18 09:37:33 +0200
commit8fce3dc5c5d6f6301f67311fa79f333902b58cea (patch)
treee3d1605bf344db3ecd03a7543966464179666e69
parent0666f560b71b899cd11a7caf39fd45129e9030fd (diff)
downloadlinux-stable-8fce3dc5c5d6f6301f67311fa79f333902b58cea.tar.gz
linux-stable-8fce3dc5c5d6f6301f67311fa79f333902b58cea.tar.bz2
linux-stable-8fce3dc5c5d6f6301f67311fa79f333902b58cea.zip
clocksource/integrator: Fix section mismatch warning
gcc-4.6 and older fail to inline integrator_clocksource_init, so they end up showing a harmless warning: WARNING: vmlinux.o(.text+0x4aa94c): Section mismatch in reference from the function integrator_clocksource_init() to the function .init.text:clocksource_mmio_init() The function integrator_clocksource_init() references the function __init clocksource_mmio_init(). This is often because integrator_clocksource_init lacks a __init annotation or the annotation of clocksource_mmio_init is wrong. Add the missing __init annotation that makes it build cleanly with all compilers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Thierry Reding <treding@nvidia.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Link: http://lkml.kernel.org/r/20170915194310.1170514-1-arnd@arndb.de
-rw-r--r--drivers/clocksource/timer-integrator-ap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
index 2ff64d9d4fb3..62d24690ba02 100644
--- a/drivers/clocksource/timer-integrator-ap.c
+++ b/drivers/clocksource/timer-integrator-ap.c
@@ -36,8 +36,8 @@ static u64 notrace integrator_read_sched_clock(void)
return -readl(sched_clk_base + TIMER_VALUE);
}
-static int integrator_clocksource_init(unsigned long inrate,
- void __iomem *base)
+static int __init integrator_clocksource_init(unsigned long inrate,
+ void __iomem *base)
{
u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC;
unsigned long rate = inrate;