Commit 47e3f23f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers-urgent-2026-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Ingo Molnar:
 "Fix an argument order bug in the alarm timer forwarding logic, which
  may cause missed expirations or incorrect overrun accounting"

* tag 'timers-urgent-2026-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Fix argument order in alarm_timer_forward()
parents f087b0ba 5d16467a

kernel/time/alarmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static s64 alarm_timer_forward(struct k_itimer *timr, ktime_t now) 
{

	struct alarm *alarm = &timr->it.alarm.alarmtimer;



	return alarm_forward(alarm, timr->it_interval, now);

	return alarm_forward(alarm, now, timr->it_interval);

}



/**