diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-06 08:32:57 -0700 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-06 08:32:57 -0700 |
| commit | 584fb4a76413ec9215741e075e0dfb69173b213f (patch) | |
| tree | f2a9f14892fdd869f82ad5affaff7480f5846066 /include/linux | |
| parent | 90d6e24a3686325edea7748b966e138c9923017d (diff) | |
| download | blackbird-op-linux-584fb4a76413ec9215741e075e0dfb69173b213f.tar.gz blackbird-op-linux-584fb4a76413ec9215741e075e0dfb69173b213f.zip | |
hrtimer: fix build bug found by Ingo
in some randconfig configurations, hrtimers are used even though
the hrtimer config if off; and it broke the build due to some of
the new functions being on the wrong side of the ifdef.
This patch moves the functions to the other side of the ifdef, fixing
the build bug.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hrtimer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 28259c336679..c407b33ef844 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -198,13 +198,6 @@ struct hrtimer_cpu_base { #endif }; -#ifdef CONFIG_HIGH_RES_TIMERS -struct clock_event_device; - -extern void clock_was_set(void); -extern void hres_timers_resume(void); -extern void hrtimer_interrupt(struct clock_event_device *dev); - /* * In high resolution mode the time reference must be read accurate */ @@ -283,6 +276,13 @@ static inline ktime_t hrtimer_expires_remaining(const struct hrtimer *timer) return ktime_sub(timer->_expires, timer->base->get_time()); } +#ifdef CONFIG_HIGH_RES_TIMERS +struct clock_event_device; + +extern void clock_was_set(void); +extern void hres_timers_resume(void); +extern void hrtimer_interrupt(struct clock_event_device *dev); + /* * The resolution of the clocks. The resolution value is returned in * the clock_getres() system call to give application programmers an |
