[GIT pull] timer updates for 5.0

From: Thomas Gleixner
Date: Sun Jan 27 2019 - 06:11:10 EST


please pull the latest timers-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus

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.



Thomas Gleixner (1):
posix-cpu-timers: Unbreak timer rearming

kernel/time/posix-cpu-timers.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 8f0644af40be..80f955210861 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -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,