diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-07 10:57:54 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-07 10:57:54 -0700 |
| commit | 2075eb8d95612cadde91ef5be82691d97a2ea6c5 (patch) | |
| tree | 896bb43afb2fcda367390a32a16f5a98728b91bc /include | |
| parent | 80a4b18d19bf1f7b88a261088c00a0d6b310a722 (diff) | |
| download | linux-stable-2075eb8d95612cadde91ef5be82691d97a2ea6c5.tar.gz linux-stable-2075eb8d95612cadde91ef5be82691d97a2ea6c5.tar.bz2 linux-stable-2075eb8d95612cadde91ef5be82691d97a2ea6c5.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hrtimer.h | 4 |
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) 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 @@ -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) { } @@ -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: */ |