Commit 7897c04a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'trace-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Srikar Dronamraju fixed a bug in the newmulti probe code"

* tag 'trace-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/probe: Fix same probe event argument matching
parents 0576f060 f8d7ab2b
...@@ -549,9 +549,10 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig, ...@@ -549,9 +549,10 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig,
for (i = 0; i < orig->tp.nr_args; i++) { for (i = 0; i < orig->tp.nr_args; i++) {
if (strcmp(orig->tp.args[i].comm, if (strcmp(orig->tp.args[i].comm,
comp->tp.args[i].comm)) comp->tp.args[i].comm))
continue; break;
} }
if (i == orig->tp.nr_args)
return true; return true;
} }
......
...@@ -431,9 +431,10 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig, ...@@ -431,9 +431,10 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig,
for (i = 0; i < orig->tp.nr_args; i++) { for (i = 0; i < orig->tp.nr_args; i++) {
if (strcmp(orig->tp.args[i].comm, if (strcmp(orig->tp.args[i].comm,
comp->tp.args[i].comm)) comp->tp.args[i].comm))
continue; break;
} }
if (i == orig->tp.nr_args)
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment