Commit 164cb546 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 63724e95 755a648e

kernel/time/time.c

+1 −1
Original line number Diff line number Diff line
@@ -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