tracing: Fix a compilation error without CONFIG_MODULES

mhiramat · rostedt · commit f00c9201f942 · 2025-03-28T08:39:56.000-04:00
There are some code which depends on CONFIG_MODULES. #ifdef to enclose it. Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Link: https://lore.kernel.org/174230515367.2909896.8132122175220657625.stgit@mhiramat.tok.corp.google.com Fixes: dca91c1 ("tracing: Have persistent trace instances save module addresses") Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
@@ -6001,6 +6001,7 @@ struct trace_scratch {
 
 static DEFINE_MUTEX(scratch_mutex);
 
+#ifdef CONFIG_MODULES
 static int save_mod(struct module *mod, void *data)
 {
 	struct trace_array *tr = data;
@@ -6025,6 +6026,12 @@ static int save_mod(struct module *mod, void *data)
 
 	return 0;
 }
+#else
+static int save_mod(struct module *mod, void *data)
+{
+	return 0;
+}
+#endif
 
 static void update_last_data(struct trace_array *tr)
 {

Original file line number	Diff line number	Diff line change
`@@ -6001,6 +6001,7 @@ struct trace_scratch {`
`6001`	`6001`
`6002`	`6002`	`static DEFINE_MUTEX(scratch_mutex);`
`6003`	`6003`
	`6004`	`+#ifdef CONFIG_MODULES`
`6004`	`6005`	`static int save_mod(struct module mod, void data)`
`6005`	`6006`	`{`
`6006`	`6007`	`struct trace_array *tr = data;`
`@@ -6025,6 +6026,12 @@ static int save_mod(struct module mod, void data)`
`6025`	`6026`
`6026`	`6027`	`return 0;`
`6027`	`6028`	`}`
	`6029`	`+#else`
	`6030`	`+static int save_mod(struct module mod, void data)`
	`6031`	`+{`
	`6032`	`+ return 0;`
	`6033`	`+}`
	`6034`	`+#endif`
`6028`	`6035`
`6029`	`6036`	`static void update_last_data(struct trace_array *tr)`
`6030`	`6037`	`{`