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;