rangetimers: fix the bug reported by Ingo for real
authorArjan van de Ven <arjan@linux.intel.com>
Mon, 13 Oct 2008 14:32:15 +0000 (10:32 -0400)
committerArjan van de Ven <arjan@linux.intel.com>
Mon, 13 Oct 2008 15:08:34 +0000 (11:08 -0400)
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>
kernel/hrtimer.c

index b17657d..2bd230b 100644 (file)
@@ -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;