rangetimers: fix the bug reported by Ingo for real

[linux-2.6-omap-h63xx.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b17657d8d81aca4913a6e1d8cdbfa6885ab9dddd..2bd230be1cb5ae3a778546d2ed0e651e153ba46e 100644 (file)
--- 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;