Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux

[karo-tx-linux.git] / kernel / time / timer.c

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 71ce3f4eead34afc12fa2743c69e8e9e77c544ad..8f5d1bf18854593e6fa27730d07a99c6700ab45c 100644 (file)
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -1495,7 +1495,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
                base->is_idle = false;
        } else {
                if (!is_max_delta)
-                       expires = basem + (nextevt - basej) * TICK_NSEC;
+                       expires = basem + (u64)(nextevt - basej) * TICK_NSEC;
                /*
                 * If we expect to sleep more than a tick, mark the base idle:
                 */