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

torvalds · torvalds · commit 164cb546e999 · 2026-03-15T11:14:09.000-07:00
Pull timer fix from Ingo Molnar:
 "Fix function tracer recursion bug by marking jiffies_64_to_clock_t()
  notrace"

* tag 'timers-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  time/jiffies: Mark jiffies_64_to_clock_t() notrace
diff --git a/kernel/time/time.c b/kernel/time/time.c
@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
  *
  * Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC)
  */
-u64 jiffies_64_to_clock_t(u64 x)
+notrace u64 jiffies_64_to_clock_t(u64 x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
 # if HZ < USER_HZ

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);`
`697`	`697`	`*`
`698`	`698`	`* Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC)`
`699`	`699`	`*/`
`700`		`-u64 jiffies_64_to_clock_t(u64 x)`
	`700`	`+notrace u64 jiffies_64_to_clock_t(u64 x)`
`701`	`701`	`{`
`702`	`702`	`#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0`
`703`	`703`	`# if HZ < USER_HZ`