aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-06 11:32:57 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-09-06 11:32:57 -0400
commit584fb4a76413ec9215741e075e0dfb69173b213f (patch)
treef2a9f14892fdd869f82ad5affaff7480f5846066 /include/linux
parent90d6e24a3686325edea7748b966e138c9923017d (diff)
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>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/hrtimer.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 28259c336679..c407b33ef844 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -198,13 +198,6 @@ struct hrtimer_cpu_base {
198#endif 198#endif
199}; 199};
200 200
201#ifdef CONFIG_HIGH_RES_TIMERS
202struct clock_event_device;
203
204extern void clock_was_set(void);
205extern void hres_timers_resume(void);
206extern void hrtimer_interrupt(struct clock_event_device *dev);
207
208/* 201/*
209 * In high resolution mode the time reference must be read accurate 202 * In high resolution mode the time reference must be read accurate
210 */ 203 */
@@ -283,6 +276,13 @@ static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer)
283 return ktime_sub(timer->_expires, timer->base->get_time()); 276 return ktime_sub(timer->_expires, timer->base->get_time());
284} 277}
285 278
279#ifdef CONFIG_HIGH_RES_TIMERS
280struct clock_event_device;
281
282extern void clock_was_set(void);
283extern void hres_timers_resume(void);
284extern void hrtimer_interrupt(struct clock_event_device *dev);
285
286/* 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