aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-10-07 13:57:54 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-10-07 13:57:54 -0400
commit2075eb8d95612cadde91ef5be82691d97a2ea6c5 (patch)
tree896bb43afb2fcda367390a32a16f5a98728b91bc
parent80a4b18d19bf1f7b88a261088c00a0d6b310a722 (diff)
rangetimer: fix x86 build failure for the !HRTIMERS case
the timer peek function was on the wrong side of an ifdef, breaking for the !HRTIMERs case. Just provide an empty inline for that case since it doesn't make sense in that scenario. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
-rw-r--r--include/linux/hrtimer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index d93b1e1dc169..508ce20b8f9c 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -283,6 +283,8 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
283 return timer->base->cpu_base->hres_active; 283 return timer->base->cpu_base->hres_active;
284} 284}
285 285
286extern void hrtimer_peek_ahead_timers(void);
287
286/* 288/*
287 * The resolution of the clocks. The resolution value is returned in 289 * The resolution of the clocks. The resolution value is returned in
288 * the clock_getres() system call to give application programmers an 290 * the clock_getres() system call to give application programmers an
@@ -305,6 +307,7 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
305 * is expired in the next softirq when the clock was advanced. 307 * is expired in the next softirq when the clock was advanced.
306 */ 308 */
307static inline void clock_was_set(void) { } 309static inline void clock_was_set(void) { }
310static inline void hrtimer_peek_ahead_timers(void) { }
308 311
309static inline void hres_timers_resume(void) { } 312static inline void hres_timers_resume(void) { }
310 313
@@ -328,7 +331,6 @@ extern ktime_t ktime_get_real(void);
328 331
329 332
330DECLARE_PER_CPU(struct tick_device, tick_cpu_device); 333DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
331extern void hrtimer_peek_ahead_timers(void);
332 334
333 335
334/* Exported timer functions: */ 336/* Exported timer functions: */