aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-24 12:28:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-24 12:28:55 -0700
commit16528a3fed5de9228de0dd7a9a4de3f3eb4c982a (patch)
tree42117a9b03f0de86d3895ccdc9b6aca0938da8a0
parent43d368a18f046587bc6ac44239fbef183242989b (diff)
parent8fce3dc5c5d6f6301f67311fa79f333902b58cea (diff)
downloadlinux-stericsson-16528a3fed5de9228de0dd7a9a4de3f3eb4c982a.tar.gz
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: "A clocksource driver section mismatch fix" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource/integrator: Fix section mismatch warning
-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;