History

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.

Arjan van de Ven committed 18 years ago

Commit 2075eb81 parent 80a4b181 file · +3 −1Browse files

Unified · Split

include/linux/hrtimer.h+3−1
@@ -283,6 +283,8 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) · 282 unmodified lines
283283 return timer->base->cpu_base->hres_active;
284284 }
285285
286+extern void hrtimer_peek_ahead_timers(void);
287+
286288 /*
287289 * The resolution of the clocks. The resolution value is returned in
288290 * the clock_getres() system call to give application programmers an
@@ -305,6 +307,7 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) · 16 unmodified lines
305307 * is expired in the next softirq when the clock was advanced.
306308 */
307309 static inline void clock_was_set(void) { }
310+static inline void hrtimer_peek_ahead_timers(void) { }
308311
309312 static inline void hres_timers_resume(void) { }
310313
@@ -328,7 +331,6 @@ extern ktime_t ktime_get_real(void); · 17 unmodified lines
328331
329332
330333 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
331−extern void hrtimer_peek_ahead_timers(void);
332334
333335
334336 /* Exported timer functions: */