From 34db4d9d5b7117f0d7827c9e6e3ff54ad60b19bf Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 5 Jan 2009 14:11:10 +0100
Subject: [PATCH] --- yaml --- r: 126823 b: refs/heads/master c:
 82c5b7b527ccc4b5d3cf832437e842f9d2920a79 h: refs/heads/master i:   126821:
 982e4bf0a29861cb5a48e9d551010681e3c4eddf   126819:
 c92f36f497795189dfa06eda8223b663e6b39af3   126815:
 2e80a379c3ae7b7a43e1426049a27b51d774b0ad v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5edece411a23..bda39cb5d78c 100644
--- 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
index aa024f2af78c..1455b7651b6b 100644
--- 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: