Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

kernel/trace/trace_kprobe.c

+3 −2
Original line number Diff line number Diff line
@@ -549,9 +549,10 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig, 
		for (i = 0; i < orig->tp.nr_args; i++) {

			if (strcmp(orig->tp.args[i].comm,

				   comp->tp.args[i].comm))

				continue;

				break;

		}



		if (i == orig->tp.nr_args)

			return true;

	}

kernel/trace/trace_uprobe.c

+3 −2
Original line number Diff line number Diff line
@@ -431,9 +431,10 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig, 
		for (i = 0; i < orig->tp.nr_args; i++) {

			if (strcmp(orig->tp.args[i].comm,

				   comp->tp.args[i].comm))

				continue;

				break;

		}



		if (i == orig->tp.nr_args)

			return true;

	}