git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'qcom-fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
kernel
/
time
/
posix-cpu-timers.c
diff --git
a/kernel/time/posix-cpu-timers.c
b/kernel/time/posix-cpu-timers.c
index 8f0644af40be7e5869f8f664775183bdb07a0f56..80f955210861a591fd383028ba6b045903be26fd 100644
(file)
--- 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,