---

yaml --- r: 126823 b: refs/heads/master c: 82c5b7b h: refs/heads/master i: 126821: 982e4bf 126819: c92f36f 126815: 2e80a37 v: v3
git-mirror · Jan 5, 2009 · 34db4d9 · 34db4d9
1 parent 1176f5c
commit 34db4d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f1d883740b09e5116d4d4e30a6a6987264a83c
+refs/heads/master: 82c5b7b527ccc4b5d3cf832437e842f9d2920a79
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
@@ -1268,7 +1268,11 @@ static void run_hrtimer_softirq(struct softirq_action *h)
 	hrtimer_peek_ahead_timers();
 }
 
-#endif	/* CONFIG_HIGH_RES_TIMERS */
+#else /* CONFIG_HIGH_RES_TIMERS */
+
+static inline void __hrtimer_peek_ahead_timers(void) { }
+
+#endif	/* !CONFIG_HIGH_RES_TIMERS */
 
 /*
  * Called from timer softirq every jiffy, expire hrtimers: