diff mbox series

tracing: fix build without CONFIG_MODULES

Message ID 20250314155052.4170214-1-arnd@kernel.org (mailing list archive)
State Superseded
Headers show
Series tracing: fix build without CONFIG_MODULES | expand

Commit Message

Arnd Bergmann March 14, 2025, 3:50 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

The tracing code fails to build when CONFIG_MODULES is disabled:

kernel/trace/trace.c: In function 'save_mod':
kernel/trace/trace.c:6041:45: error: invalid use of undefined type 'struct module'
 6041 |         entry->mod_addr = (unsigned long)mod->mem[MOD_TEXT].base;
      |                                             ^~

The problem here is that 'struct module' is not defined in this configuration.

Enclose the functions in another #ifdef, just like other parts of this file
already are.

Fixes: dca91c1c5468 ("tracing: Have persistent trace instances save module addresses")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/trace/trace.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Steven Rostedt March 21, 2025, 4:35 p.m. UTC | #1 
On Fri, 14 Mar 2025 16:50:49 +0100
Arnd Bergmann <arnd@kernel.org> wrote:

> From: Arnd Bergmann <arnd@arndb.de>
> 
> The tracing code fails to build when CONFIG_MODULES is disabled:
> 
> kernel/trace/trace.c: In function 'save_mod':
> kernel/trace/trace.c:6041:45: error: invalid use of undefined type 'struct module'
>  6041 |         entry->mod_addr = (unsigned long)mod->mem[MOD_TEXT].base;
>       |                                             ^~
> 
> The problem here is that 'struct module' is not defined in this configuration.
> 
> Enclose the functions in another #ifdef, just like other parts of this file
> already are.
> 
> Fixes: dca91c1c5468 ("tracing: Have persistent trace instances save module addresses")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---

Thanks, but Masami already sent one fix where I commented on and he
then sent an update:

  https://lore.kernel.org/all/174188321162.3845006.12665585959241736399.stgit@mhiramat.tok.corp.google.com/

and the update:

  https://lore.kernel.org/all/174230515367.2909896.8132122175220657625.stgit@mhiramat.tok.corp.google.com/

-- Steve
diff mbox series

Patch

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a6105b6dcc2b..51c030b9887e 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6019,6 +6019,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;
@@ -6043,6 +6044,7 @@  static int save_mod(struct module *mod, void *data)
 
 	return 0;
 }
+#endif
 
 static void update_last_data(struct trace_array *tr)
 {
@@ -6060,7 +6062,9 @@  static void update_last_data(struct trace_array *tr)
 		tscratch->nr_entries = 0;
 
 		guard(mutex)(&scratch_mutex);
+#ifdef CONFIG_MODULES
 		module_for_each_mod(save_mod, tr);
+#endif
 	}
 
 	if (!(tr->flags & TRACE_ARRAY_FL_LAST_BOOT))