Merge tag 'tty-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[mirror_ubuntu-zesty-kernel.git] / kernel / time / tick-broadcast-hrtimer.c

diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
index 690b797f522e38945ec021cfabe799568448cd7a..a7bb8f33ae0703b2d0ebd1e65954f433c85dbde2 100644 (file)
--- a/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/time/tick-broadcast-hrtimer.c
@@ -97,7 +97,7 @@ static enum hrtimer_restart bc_handler(struct hrtimer *t)
        ce_broadcast_hrtimer.event_handler(&ce_broadcast_hrtimer);
 
        if (clockevent_state_oneshot(&ce_broadcast_hrtimer))
-               if (ce_broadcast_hrtimer.next_event.tv64 != KTIME_MAX)
+               if (ce_broadcast_hrtimer.next_event != KTIME_MAX)
                        return HRTIMER_RESTART;
 
        return HRTIMER_NORESTART;