From 54514267d757539392bc98d62d45647aa526088b Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 13 Oct 2008 10:32:15 -0400 Subject: [PATCH] --- yaml --- r: 117625 b: refs/heads/master c: dc4304f7deee29fcdf6a2b62f7146ea7f505fd42 h: refs/heads/master i: 117623: 9101b8e6ce550d5c02eb5a6f37396f6b05e3c1bc v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c98ef14bb4fc..9463b1a42d06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 030aebd2e439a2ebcca2b0ce30a02ed84feb043e +refs/heads/master: dc4304f7deee29fcdf6a2b62f7146ea7f505fd42 diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index b17657d8d81a..2bd230be1cb5 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/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;