Commit d1faa3e7 authored Aug 04, 2017 by Linus Torvalds

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

parents 65f4740e 34f41c03

kernel/time/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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:
		*/

Admin message