Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b17d1ce7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'timers/urgent' into timers/core

Merge urgent fix so depending cleanup patch can be applied.
parents a4cffdad 93ad0fc0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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,