From 4cb4bdbc325e2548ae8051d259581e9acd787e1e Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Tue, 7 Oct 2008 10:57:54 -0700 Subject: [PATCH] --- yaml --- r: 117621 b: refs/heads/master c: 2075eb8d95612cadde91ef5be82691d97a2ea6c5 h: refs/heads/master i: 117619: b7f3246f2a886a8dc353931ffa61cd1005e096ec v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6b275977c209..839ad123210d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80a4b18d19bf1f7b88a261088c00a0d6b310a722 +refs/heads/master: 2075eb8d95612cadde91ef5be82691d97a2ea6c5 diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index d93b1e1dc169..508ce20b8f9c 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/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: */