lkml.org 
[lkml]   [2009]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] hrtimer: splitout peek ahead functionality, fix

* Ingo Molnar <mingo@elte.hu> wrote:

>
> * Peter Zijlstra <a.p.zijlstra@chello.nl> wrote:
>
> > Please consider for .29.
>
> picked them up into tip/timers/urgent:
>
> e3f1d88: hrtimer: fixup comments
> a6037b6: hrtimer: fix recursion deadlock by re-introducing the softirq
> 731a55b: hrtimer: simplify hotplug migration
> d5fd43c: hrtimer: fix HOTPLUG_CPU=n compile warning
> 8bdec95: hrtimer: splitout peek ahead functionality

i needed the small fixlet below, for !HIGH_RES_TIMERS.

Ingo

-------------->
From 82c5b7b527ccc4b5d3cf832437e842f9d2920a79 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 5 Jan 2009 14:11:10 +0100
Subject: [PATCH] hrtimer: splitout peek ahead functionality, fix

Impact: build fix on !CONFIG_HIGH_RES_TIMERS

Fix:

kernel/hrtimer.c:1586: error: implicit declaration of function '__hrtimer_peek_ahead_timers'

Signen-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/hrtimer.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index aa024f2..1455b76 100644
--- a/kernel/hrtimer.c
+++ b/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:

\
 
 \ /
  Last update: 2009-01-05 14:17    [W:0.040 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site