From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Date: Tue, 18 Mar 2025 13:39:13 +0000 (+0900)
Subject: tracing: Fix a compilation error without CONFIG_MODULES
X-Git-Tag: v6.15-rc1~90^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f00c9201f942dddb58617c881ffd4e4a1a1c49ab;p=thirdparty%2Flinux.git

tracing: Fix a compilation error without CONFIG_MODULES

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: dca91c1c5468 ("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
index e7a14bb7d7aae..7f8b0c43d2a50 100644
--- 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)
 {