diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-15 11:14:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-03-15 11:14:09 -0700 |
| commit | 164cb546e9999637e26eac76971e6c4438a400a9 (patch) | |
| tree | da31a7f614cab64cea1d1099fd173f0201346a20 /kernel | |
| parent | 63724e9519a312d7d0b8767d0aeb53bc15a7fdd5 (diff) | |
| parent | 755a648e78f12574482d4698d877375793867fa1 (diff) | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/time.c b/kernel/time/time.c index 36fd2313ae7e..0d832317d576 100644 --- 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 |