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

Commit 74f40c1f authored May 06, 2015 by Ingo Molnar

Merge tag 'perf-urgent-for-mingo' of...

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Fix 'perf probe -a' segfault if passed with '' (Wang Nan)

  - Fix report -T/--threads option (Namhyung Kim)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents 8cc67c3b e59d29e8

tools/perf/builtin-report.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -329,7 +329,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
	fprintf(stdout, "\n\n");		fprintf(stdout, "\n\n");
	}		}

	if (sort_order == default_sort_order &&		if (sort_order == NULL &&
	parent_pattern == default_parent_pattern) {		parent_pattern == default_parent_pattern) {
	fprintf(stdout, "#\n# (%s)\n#\n", help);		fprintf(stdout, "#\n# (%s)\n#\n", help);

tools/perf/util/probe-event.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1084,6 +1084,8 @@ static int parse_perf_probe_point(char arg, struct perf_probe_event pev)
	*		*
	* TODO:Group name support		* TODO:Group name support
	*/		*/
			if (!arg)
			return -EINVAL;

	ptr = strpbrk(arg, ";=@+%");		ptr = strpbrk(arg, ";=@+%");
	if (ptr && ptr == '=') { / Event name */		if (ptr && ptr == '=') { / Event name */