Commit 16528a3f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 43d368a1 8fce3dc5
...@@ -36,7 +36,7 @@ static u64 notrace integrator_read_sched_clock(void) ...@@ -36,7 +36,7 @@ static u64 notrace integrator_read_sched_clock(void)
return -readl(sched_clk_base + TIMER_VALUE); return -readl(sched_clk_base + TIMER_VALUE);
} }
static int integrator_clocksource_init(unsigned long inrate, static int __init integrator_clocksource_init(unsigned long inrate,
void __iomem *base) void __iomem *base)
{ {
u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC; u32 ctrl = TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment