diff --git a/[refs] b/[refs] index e0db191fd38b..f481fe879e96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1dd7bc58578ebfcaba989608017fe5156c29c86 +refs/heads/master: 643bdf68f92a8516574ed7ca3713f9334c331b8d diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 00e6f0a1e7a3..4fc41414fc06 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -1394,22 +1394,16 @@ void hrtimer_interrupt(struct clock_event_device *dev) */ void hrtimer_peek_ahead_timers(void) { - unsigned long flags; struct tick_device *td; - struct clock_event_device *dev; + unsigned long flags; if (!hrtimer_hres_active()) return; local_irq_save(flags); td = &__get_cpu_var(tick_cpu_device); - if (!td) - goto out; - dev = td->evtdev; - if (!dev) - goto out; - hrtimer_interrupt(dev); -out: + if (td && td->evtdev) + hrtimer_interrupt(td->evtdev); local_irq_restore(flags); }