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
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 in289 * The resolution of the clocks. The resolution value is returned in
288 * the clock_getres() system call to give application programmers an290 * 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
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); · 17 unmodified lines
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: */