Skip to content

Commit 93c88d0

Browse files
committed
tracing: Make tracing_update_buffers() take NULL for global_trace
The trace.c file has become a dumping ground for all tracing code and has become quite large. In order to move the trace_printk functions out of it these functions can not access global_trace directly, as that is something that needs to stay static in trace.c. Have tracing_update_buffers() take NULL for its trace_array to denote it should work on the global_trace top level trace_array allows that function to be used outside of trace.c and still update the global_trace trace_array. Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Andrew Morton <akpm@linux-foundation.org> Link: https://patch.msgid.link/20260208032450.318864210@kernel.org Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 1c53d78 commit 93c88d0

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

kernel/trace/trace.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3234,7 +3234,7 @@ void trace_printk_init_buffers(void)
32343234
pr_warn("**********************************************************\n");
32353235

32363236
/* Expand the buffers to set size */
3237-
if (tracing_update_buffers(&global_trace) < 0)
3237+
if (tracing_update_buffers(NULL) < 0)
32383238
pr_err("Failed to expand tracing buffers for trace_printk() calls\n");
32393239
else
32403240
buffers_allocated = 1;
@@ -6186,6 +6186,9 @@ int tracing_update_buffers(struct trace_array *tr)
61866186
{
61876187
int ret = 0;
61886188

6189+
if (!tr)
6190+
tr = &global_trace;
6191+
61896192
guard(mutex)(&trace_types_lock);
61906193

61916194
update_last_data(tr);

0 commit comments

Comments
 (0)