tracing: A couple of additions for v6.14
Steven Rostedt
maintainercover tracing: A couple of additions for v6.14
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(-)
Steven Rostedt
maintainerPATCH 1/2 tracing: Fix #if CONFIG_MODULES to #ifdef CONFIG_MODULES
From: Steven Rostedt <[email protected]>
A typo was introduced when adding the ":mod:" command that did a "#if CONFIG_MODULES" instead of a "#ifdef CONFIG_MODULES". Fix it.
--- kernel/trace/trace_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_events.c +1 -1
@@ -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;
Signature · 1 line
2.45.2
Steven Rostedt
maintainerPATCH 2/2 tracing: Rename update_cache() to update_mod_cache()
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
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.
--- kernel/trace/trace_events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_events.c +2 -2
@@ -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)
Signature · 1 line
2.45.2