diff --git a/[refs] b/[refs] index 34f27210def0..4ad8d5b494e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fd87545c97b91cf9cfa52e914d66863878efe60 +refs/heads/master: 2778d0d51dd5007c4909c1d9874f5e9097785a7a diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index eb2cf984959f..2bd230be1cb5 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -1396,7 +1396,7 @@ void hrtimer_peek_ahead_timers(void) struct tick_device *td; struct clock_event_device *dev; - if (hrtimer_hres_active()) + if (!hrtimer_hres_active()) return; local_irq_save(flags);