From 6945006a70edc6733a8a8ad39913a47ce4a6c5b8 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sat, 6 Sep 2008 09:36:56 -0700 Subject: [PATCH] --- yaml --- r: 117611 b: refs/heads/master c: 2ec02270c00f94b08fddfb68c37510a9fb47ac7c h: refs/heads/master i: 117609: ca58c48d2e777a0ae9b9523ebc580c4f5a4bf62f 117607: 38136ca91b6baedb5f875cf74be6383f1d97fc46 v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index fb9f0cba5ad4..693afae2aef8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 584fb4a76413ec9215741e075e0dfb69173b213f +refs/heads/master: 2ec02270c00f94b08fddfb68c37510a9fb47ac7c diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index c407b33ef844..4c1a834b9849 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/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; @@ -283,6 +270,19 @@ 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 + */ +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