summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-08-04 15:14:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-08-04 15:14:09 -0700
commitd1faa3e78a2b11adc9461ebf7593df75cc93bce3 (patch)
treec8cc29e94d123755960e9fa2fed1bbfc5c8656f1 /kernel
parent65f4740e72991fd565791b86b6cf8725fc8eb5bc (diff)
parent34f41c0316ed52b0b44542491d89278efdaa70e4 (diff)
downloadlinux-d1faa3e78a2b11adc9461ebf7593df75cc93bce3.tar.bz2
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner: "A single fix for a multiplication overflow in the timer code on 32bit systems" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timers: Fix overflow in get_next_timer_interrupt
Diffstat (limited to 'kernel')
-rw-r--r--kernel/time/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index 71ce3f4eead3..8f5d1bf18854 100644
--- 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:
*/