---

yaml --- r: 117621 b: refs/heads/master c: 2075eb8 h: refs/heads/master i: 117619: b7f3246 v: v3
git-mirror · Oct 7, 2008 · 4cb4bdb · 4cb4bdb
1 parent 4ed0d81
commit 4cb4bdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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: */