torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

time/jiffies: Mark jiffies_64_to_clock_t() notrace

Browse Source 
The trace_clock_jiffies() function that handles the "uptime" clock for
tracing calls jiffies_64_to_clock_t(). This causes the function tracer to
constantly recurse when the tracing clock is set to "uptime". Mark it
notrace to prevent unnecessary recursion when using the "uptime" clock.

Fixes: 58d4e21e50 ("tracing: Fix wraparound problems in "uptime" trace clock")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260306212403.72270bb2@robin
This commit is contained in:
Steven Rostedt
2026-03-06 21:24:03 -05:00
committed by Thomas Gleixner
parent 1f318b96cc
commit 755a648e78
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/time/time.c
View File

@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
* *
* Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC) * 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 (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
# if HZ < USER_HZ # if HZ < USER_HZ