summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-01-15 16:35:14 +0100
committerThomas Gleixner <tglx@linutronix.de>2019-01-15 16:35:14 +0100
commitb17d1ce7efe21e075dace85658d26d354766b443 (patch)
tree97bce6e52c417120c2ca9e5c09d966a6f49bbb22 /kernel/time
parenta4cffdad731447217701d3bc6da4587bbb4d2cbd (diff)
parent93ad0fc088c5b4631f796c995bdd27a082ef33a6 (diff)
downloadlinux-b17d1ce7efe21e075dace85658d26d354766b443.tar.bz2
Merge branch 'timers/urgent' into timers/core
Merge urgent fix so depending cleanup patch can be applied.
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/posix-cpu-timers.c1
1 files changed, 1 insertions, 0 deletions
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,