Skip to content

Commit f77fb9b

Browse files
committed
tracing/osnoise: Fix build when timerlat is not enabled
jira LE-2157 Rebuild_History Non-Buildable kernel-5.14.0-503.14.1.el9_5 commit-author Steven Rostedt <[email protected]> commit af17814 To fix some critical section races, the interface_lock was added to a few locations. One of those locations was above where the interface_lock was declared, so the declaration was moved up before that usage. Unfortunately, where it was placed was inside a CONFIG_TIMERLAT_TRACER ifdef block. As the interface_lock is used outside that config, this broke the build when CONFIG_OSNOISE_TRACER was enabled but CONFIG_TIMERLAT_TRACER was not. Cc: Masami Hiramatsu <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Cc: "Helena Anna" <[email protected]> Cc: "Luis Claudio R. Goncalves" <[email protected]> Cc: Tomas Glozar <[email protected]> Link: https://lore.kernel.org/[email protected] Fixes: e6a5348 ("tracing/timerlat: Only clear timer if a kthread exists") Reported-by: "Bityutskiy, Artem" <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]> (cherry picked from commit af17814) Signed-off-by: Jonathan Maple <[email protected]>
1 parent 9237b6e commit f77fb9b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

kernel/trace/trace_osnoise.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@ static inline struct osnoise_variables *this_cpu_osn_var(void)
228228
return this_cpu_ptr(&per_cpu_osnoise_var);
229229
}
230230

231+
/*
232+
* Protect the interface.
233+
*/
234+
static struct mutex interface_lock;
235+
231236
#ifdef CONFIG_TIMERLAT_TRACER
232237
/*
233238
* Runtime information for the timer mode.
@@ -252,11 +257,6 @@ static inline struct timerlat_variables *this_cpu_tmr_var(void)
252257
return this_cpu_ptr(&per_cpu_timerlat_var);
253258
}
254259

255-
/*
256-
* Protect the interface.
257-
*/
258-
static struct mutex interface_lock;
259-
260260
/*
261261
* tlat_var_reset - Reset the values of the given timerlat_variables
262262
*/

0 commit comments

Comments
 (0)