From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 13 Oct 2008 14:32:15 +0000 (-0400)
Subject: rangetimers: fix the bug reported by Ingo for real
X-Git-Tag: v2.6.28-rc1~18^2^2~3^2~2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dc4304f7deee29fcdf6a2b62f7146ea7f505fd42;p=linux-2.6-omap-h63xx.git

rangetimers: fix the bug reported by Ingo for real

and please hand me a brown paper bag

(thanks to Thomas for pointing out this very obvious bug)

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
---

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b17657d8d81..2bd230be1cb 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1395,15 +1395,11 @@ void hrtimer_peek_ahead_timers(void)
 	unsigned long flags;
 	struct tick_device *td;
 	struct clock_event_device *dev;
-	struct hrtimer_cpu_base *cpu_base;
-	if (hrtimer_hres_active())
+
+	if (!hrtimer_hres_active())
 		return;
 
 	local_irq_save(flags);
-	cpu_base = &__get_cpu_var(hrtimer_bases);
-	if (!cpu_base->hres_active)
-		goto out;
-
 	td = &__get_cpu_var(tick_cpu_device);
 	if (!td)
 		goto out;