2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00

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
commit b17d1ce7ef

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.
*/
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,