diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-06 09:36:56 -0700 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-06 09:36:56 -0700 |
commit | 2ec02270c00f94b08fddfb68c37510a9fb47ac7c (patch) | |
tree | 71a788cf76febe61ef5f6fcaa01cb485dfdf4d28 | |
parent | 584fb4a76413ec9215741e075e0dfb69173b213f (diff) | |
download | op-kernel-dev-2ec02270c00f94b08fddfb68c37510a9fb47ac7c.zip op-kernel-dev-2ec02270c00f94b08fddfb68c37510a9fb47ac7c.tar.gz |
hrtimer: another build fix
More randconfig testing
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
-rw-r--r-- | include/linux/hrtimer.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index c407b33..4c1a834 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -198,19 +198,6 @@ struct hrtimer_cpu_base { #endif }; -/* - * In high resolution mode the time reference must be read accurate - */ -static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer) -{ - return timer->base->get_time(); -} - -static inline int hrtimer_is_hres_active(struct hrtimer *timer) -{ - return timer->base->cpu_base->hres_active; -} - static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) { timer->_expires = time; @@ -284,6 +271,19 @@ 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 + */ +static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer) +{ + return timer->base->get_time(); +} + +static inline int hrtimer_is_hres_active(struct hrtimer *timer) +{ + return timer->base->cpu_base->hres_active; +} + +/* * The resolution of the clocks. The resolution value is returned in * the clock_getres() system call to give application programmers an * idea of the (in)accuracy of timers. Timer values are rounded up to |