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
This commit is contained in:
@ -36,8 +36,8 @@ 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;
|
||||||
unsigned long rate = inrate;
|
unsigned long rate = inrate;
|
||||||
|
Reference in New Issue
Block a user