aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-10-13 10:32:15 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-10-13 11:08:34 -0400
commitdc4304f7deee29fcdf6a2b62f7146ea7f505fd42 (patch)
tree118c222aa98b61a48529b6678b5eb0ee95db211a
parent030aebd2e439a2ebcca2b0ce30a02ed84feb043e (diff)
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>
-rw-r--r--kernel/hrtimer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b17657d8d81a..2bd230be1cb5 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1395,15 +1395,11 @@ void hrtimer_peek_ahead_timers(void)
1395 unsigned long flags; 1395 unsigned long flags;
1396 struct tick_device *td; 1396 struct tick_device *td;
1397 struct clock_event_device *dev; 1397 struct clock_event_device *dev;
1398 struct hrtimer_cpu_base *cpu_base; 1398
1399 if (hrtimer_hres_active()) 1399 if (!hrtimer_hres_active())
1400 return; 1400 return;
1401 1401
1402 local_irq_save(flags); 1402 local_irq_save(flags);
1403 cpu_base = &__get_cpu_var(hrtimer_bases);
1404 if (!cpu_base->hres_active)
1405 goto out;
1406
1407 td = &__get_cpu_var(tick_cpu_device); 1403 td = &__get_cpu_var(tick_cpu_device);
1408 if (!td) 1404 if (!td)
1409 goto out; 1405 goto out;