diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-13 16:32:15 +0200 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-13 17:08:34 +0200 |
| commit | dc4304f7deee29fcdf6a2b62f7146ea7f505fd42 (patch) | |
| tree | 118c222aa98b61a48529b6678b5eb0ee95db211a /kernel/hrtimer.c | |
| parent | rangetimer: fix BUG_ON reported by Ingo (diff) | |
| download | linux-dc4304f7deee29fcdf6a2b62f7146ea7f505fd42.tar.xz linux-dc4304f7deee29fcdf6a2b62f7146ea7f505fd42.zip | |
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>
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 8 |
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) 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; |