Commit f907bb4c authored Jan 27, 2019 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 Glexiner:
 "A single regression fix to address the unintended breakage of posix
  cpu timers.

  This is caused by a new sanity check in the common code, which fails
  for posix cpu timers under certain conditions because the posix cpu
  timer code never updates the variable which is checked"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix-cpu-timers: Unbreak timer rearming

parents 98810518 93ad0fc0

kernel/time/posix-cpu-timers.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
		* set up the signal and overrun bookkeeping.
		*/
		timer->it.cpu.incr = timespec64_to_ns(&new->it_interval);
		timer->it_interval = ns_to_ktime(timer->it.cpu.incr);

		/*
		* This acts as a modification timestamp for the timer,