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

torvalds · torvalds · commit 47e3f23f0e1c · 2026-03-29T10:02:38.000-07:00
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()
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
@@ -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);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -540,7 +540,7 @@ static s64 alarm_timer_forward(struct k_itimer *timr, ktime_t now)`
`540`	`540`	`{`
`541`	`541`	`struct alarm *alarm = &timr->it.alarm.alarmtimer;`
`542`	`542`
`543`		`- return alarm_forward(alarm, timr->it_interval, now);`
	`543`	`+ return alarm_forward(alarm, now, timr->it_interval);`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`/**`