Commit 16528a3f authored Sep 24, 2017 by 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

drivers/clocksource/timer-integrator-ap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ static u64 notrace integrator_read_sched_clock(void)
		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)
		{
		u32 ctrl = TIMER_CTRL_ENABLE \| TIMER_CTRL_PERIODIC;