Commit 755a648e authored by Steven Rostedt's avatar Steven Rostedt Committed by Thomas Gleixner
Browse files

time/jiffies: Mark jiffies_64_to_clock_t() notrace 



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: 58d4e21e ("tracing: Fix wraparound problems in "uptime" trace clock")
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260306212403.72270bb2@robin
parent 1f318b96

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