aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-06 12:36:56 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-09-06 12:36:56 -0400
commit2ec02270c00f94b08fddfb68c37510a9fb47ac7c (patch)
tree71a788cf76febe61ef5f6fcaa01cb485dfdf4d28 /include
parent584fb4a76413ec9215741e075e0dfb69173b213f (diff)
hrtimer: another build fix
More randconfig testing Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hrtimer.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index c407b33ef844..4c1a834b9849 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -198,19 +198,6 @@ struct hrtimer_cpu_base {
198#endif 198#endif
199}; 199};
200 200
201/*
202 * In high resolution mode the time reference must be read accurate
203 */
204static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer)
205{
206 return timer->base->get_time();
207}
208
209static inline int hrtimer_is_hres_active(struct hrtimer *timer)
210{
211 return timer->base->cpu_base->hres_active;
212}
213
214static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time) 201static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
215{ 202{
216 timer->_expires = time; 203 timer->_expires = time;
@@ -284,6 +271,19 @@ extern void hres_timers_resume(void);
284extern void hrtimer_interrupt(struct clock_event_device *dev); 271extern void hrtimer_interrupt(struct clock_event_device *dev);
285 272
286/* 273/*
274 * In high resolution mode the time reference must be read accurate
275 */
276static inline ktime_t hrtimer_cb_get_time(struct hrtimer *timer)
277{
278 return timer->base->get_time();
279}
280
281static inline int hrtimer_is_hres_active(struct hrtimer *timer)
282{
283 return timer->base->cpu_base->hres_active;
284}
285
286/*
287 * The resolution of the clocks. The resolution value is returned in 287 * The resolution of the clocks. The resolution value is returned in
288 * the clock_getres() system call to give application programmers an 288 * the clock_getres() system call to give application programmers an
289 * idea of the (in)accuracy of timers. Timer values are rounded up to 289 * idea of the (in)accuracy of timers. Timer values are rounded up to