The following commit has been merged into the perf/core branch of tip: Commit-ID: e9ffc8c1b83931599663c21ba9082bcafa51d333 Gitweb: https://git.kernel.org/tip/e9ffc8c1b83931599663c21ba9082bcafa51d333 Author: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com> AuthorDate: Mon, 21 Sep 2020 21:24:25 -04:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Thu, 24 Sep 2020 15:55:49 +02:00
kprobes: Use module_name() macro It is advised to use module_name() macro instead of dereferencing mod->name directly. This makes sense for consistencys sake and also it prevents a hard dependency to CONFIG_MODULES. Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com> Signed-off-by: Steven Rostedt (VMware) <rost...@goodmis.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Acked-by: Masami Hiramatsu <mhira...@kernel.org> Link: https://lkml.kernel.org/r/20200818050857.117998-1-jarkko.sakki...@linux.intel.com --- kernel/trace/trace_kprobe.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index aefb606..19c00ee 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -106,9 +106,10 @@ static nokprobe_inline bool trace_kprobe_has_gone(struct trace_kprobe *tk) static nokprobe_inline bool trace_kprobe_within_module(struct trace_kprobe *tk, struct module *mod) { - int len = strlen(mod->name); + int len = strlen(module_name(mod)); const char *name = trace_kprobe_symbol(tk); - return strncmp(mod->name, name, len) == 0 && name[len] == ':'; + + return strncmp(module_name(mod), name, len) == 0 && name[len] == ':'; } static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk) @@ -688,7 +689,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb, if (ret) pr_warn("Failed to re-register probe %s on %s: %d\n", trace_probe_name(&tk->tp), - mod->name, ret); + module_name(mod), ret); } } mutex_unlock(&event_mutex);
