Skip to content

Commit

Permalink
rangetimer: fix x86 build failure for the !HRTIMERS case
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arjan van de Ven committed Oct 7, 2008
1 parent 80a4b18 commit 2075eb8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion include/linux/hrtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
return timer->base->cpu_base->hres_active;
}

extern void hrtimer_peek_ahead_timers(void);

/*
* The resolution of the clocks. The resolution value is returned in
* the clock_getres() system call to give application programmers an
Expand All @@ -305,6 +307,7 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer)
* is expired in the next softirq when the clock was advanced.
*/
static inline void clock_was_set(void) { }
static inline void hrtimer_peek_ahead_timers(void) { }

static inline void hres_timers_resume(void) { }

Expand All @@ -328,7 +331,6 @@ extern ktime_t ktime_get_real(void);


DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
extern void hrtimer_peek_ahead_timers(void);


/* Exported timer functions: */
Expand Down

0 comments on commit 2075eb8

Please sign in to comment.