mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
hrtimer: fix build bug found by Ingo
in some randconfig configurations, hrtimers are used even though the hrtimer config if off; and it broke the build due to some of the new functions being on the wrong side of the ifdef. This patch moves the functions to the other side of the ifdef, fixing the build bug. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
This commit is contained in:
parent
90d6e24a36
commit
584fb4a764
1 changed files with 7 additions and 7 deletions
|
@ -198,13 +198,6 @@ struct hrtimer_cpu_base {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_HIGH_RES_TIMERS
|
|
||||||
struct clock_event_device;
|
|
||||||
|
|
||||||
extern void clock_was_set(void);
|
|
||||||
extern void hres_timers_resume(void);
|
|
||||||
extern void hrtimer_interrupt(struct clock_event_device *dev);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* In high resolution mode the time reference must be read accurate
|
* In high resolution mode the time reference must be read accurate
|
||||||
*/
|
*/
|
||||||
|
@ -283,6 +276,13 @@ static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)
|
||||||
return ktime_sub(timer->_expires, timer->base->get_time());
|
return ktime_sub(timer->_expires, timer->base->get_time());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_HIGH_RES_TIMERS
|
||||||
|
struct clock_event_device;
|
||||||
|
|
||||||
|
extern void clock_was_set(void);
|
||||||
|
extern void hres_timers_resume(void);
|
||||||
|
extern void hrtimer_interrupt(struct clock_event_device *dev);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The resolution of the clocks. The resolution value is returned in
|
* The resolution of the clocks. The resolution value is returned in
|
||||||
* the clock_getres() system call to give application programmers an
|
* the clock_getres() system call to give application programmers an
|
||||||
|
|
Loading…
Reference in a new issue