[for-next][PATCH 0/2] tracing: A couple of additions for v6.14

[for-next][PATCH 0/2] tracing: A couple of additions for v6.14

[Steven Rostedt]

  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
trace/for-next

Head SHA1: 22412b72cafd1b2570c2f9f14b7a133bdff8b80c


Steven Rostedt (2):
      tracing: Fix #if CONFIG_MODULES to #ifdef CONFIG_MODULES
      tracing: Rename update_cache() to update_mod_cache()

----
 kernel/trace/trace_events.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[for-next][PATCH 1/2] tracing: Fix #if CONFIG_MODULES to #ifdef CONFIG_MODULES

[Steven Rostedt]

From: Steven Rostedt <rostedt@goodmis.org>

A typo was introduced when adding the ":mod:" command that did
a "#if CONFIG_MODULES" instead of a "#ifdef CONFIG_MODULES".
Fix it.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/20250120125745.4ac90ca6@gandalf.local.home
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501190121.E2CIJuUj-lkp@intel.com/
Fixes: b355247df104e ("tracing: Cache ":mod:" events for modules not loaded yet")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace_events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index f762e554fad4..bb1406719c3f 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -857,7 +857,7 @@ static int ftrace_event_enable_disable(struct trace_event_file *file,
 	return __ftrace_event_enable_disable(file, enable, 0);
 }
 
-#if CONFIG_MODULES
+#ifdef CONFIG_MODULES
 struct event_mod_load {
 	struct list_head	list;
 	char			*module;
-- 
2.45.2

[for-next][PATCH 2/2] tracing: Rename update_cache() to update_mod_cache()

[Steven Rostedt]

From: Steven Rostedt <rostedt@goodmis.org>

The static function in trace_events.c called update_cache() is too generic
and conflicts with the function defined in arch/openrisc/include/asm/pgtable.h

Rename it to update_mod_cache() to make it less generic.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250120172756.4ecfb43f@batman.local.home
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202501210550.Ufrj5CRn-lkp@intel.com/
Fixes: b355247df104e ("tracing: Cache ":mod:" events for modules not loaded yet")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace_events.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index bb1406719c3f..51c5014877e8 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -3580,7 +3580,7 @@ EXPORT_SYMBOL_GPL(trace_remove_event_call);
 	     event++)
 
 #ifdef CONFIG_MODULES
-static void update_cache(struct trace_array *tr, struct module *mod)
+static void update_mod_cache(struct trace_array *tr, struct module *mod)
 {
 	struct event_mod_load *event_mod, *n;
 
@@ -3600,7 +3600,7 @@ static void update_cache_events(struct module *mod)
 	struct trace_array *tr;
 
 	list_for_each_entry(tr, &ftrace_trace_arrays, list)
-		update_cache(tr, mod);
+		update_mod_cache(tr, mod);
 }
 
 static void trace_module_add_events(struct module *mod)
-- 
2.45.2