diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2026-03-06 21:24:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-03-19 16:08:31 +0100 |
| commit | 2d845604ca4fb0b020f6ed9e968dee4bd5dd420a (patch) | |
| tree | c9d6e8ac04130a0b5803bffd5964cba822b54893 /kernel/time | |
| parent | 2e8e9aea8cd5a9fdcd450ebb5e4f56b2056b3c6a (diff) | |
| download | linux-2d845604ca4fb0b020f6ed9e968dee4bd5dd420a.tar.gz linux-2d845604ca4fb0b020f6ed9e968dee4bd5dd420a.tar.bz2 linux-2d845604ca4fb0b020f6ed9e968dee4bd5dd420a.zip | |
time/jiffies: Mark jiffies_64_to_clock_t() notrace
[ Upstream commit 755a648e78f12574482d4698d877375793867fa1 ]
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: 58d4e21e50ff3 ("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
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel/time')
| -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 0ba8e3c50d62..155cf7def914 100644 --- a/kernel/time/time.c +++ b/kernel/time/time.c @@ -702,7 +702,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 |