Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 16528a3fed5d · 2017-09-24T12:28:55.000-07:00
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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ static u64 notrace integrator_read_sched_clock(void)`
`36`	`36`	`return -readl(sched_clk_base + TIMER_VALUE);`
`37`	`37`	`}`
`38`	`38`
`39`		`-static int integrator_clocksource_init(unsigned long inrate,`
`40`		`- void __iomem *base)`
	`39`	`+static int __init integrator_clocksource_init(unsigned long inrate,`
	`40`	`+ void __iomem *base)`
`41`	`41`	`{`
`42`	`42`	`u32 ctrl = TIMER_CTRL_ENABLE \| TIMER_CTRL_PERIODIC;`
`43`	`43`	`unsigned long rate = inrate;`