Skip to content

Commit 755a648

Browse files
rostedtThomas Gleixner
authored andcommitted
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: 58d4e21 ("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
1 parent 1f318b9 commit 755a648

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/time/time.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
697697
*
698698
* Return: jiffies_64 value converted to 64-bit "clock_t" (CLOCKS_PER_SEC)
699699
*/
700-
u64 jiffies_64_to_clock_t(u64 x)
700+
notrace u64 jiffies_64_to_clock_t(u64 x)
701701
{
702702
#if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
703703
# if HZ < USER_HZ

0 commit comments

Comments
 (0)