p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'timers/urgent' into timers/core 

Merge urgent fix so depending cleanup patch can be applied.
This commit is contained in:
Thomas Gleixner 2019-01-15 16:35:14 +01:00
parent a4cffdad73 93ad0fc088
commit b17d1ce7ef
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/time/posix-cpu-timers.c
View File

@ -685,6 +685,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
* set up the signal and overrun bookkeeping. * set up the signal and overrun bookkeeping.
*/ */
timer->it.cpu.incr = timespec64_to_ns(&new->it_interval); 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, * This acts as a modification timestamp for the timer,