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

Ingo Molnar · Ingo Molnar · commit 74f40c1f4376 · 2015-05-06T04:54:11.000+02:00
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 &lt;acme@redhat.com&gt;
Signed-off-by: Ingo Molnar &lt;mingo@kernel.org&gt;
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
@@ -329,7 +329,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
 		fprintf(stdout, "\n\n");
 	}
 
-	if (sort_order == default_sort_order &&
+	if (sort_order == NULL &&
 	    parent_pattern == default_parent_pattern) {
 		fprintf(stdout, "#\n# (%s)\n#\n", help);
 
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
@@ -1084,6 +1084,8 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
 	 *
 	 * TODO:Group name support
 	 */
+	if (!arg)
+		return -EINVAL;
 
 	ptr = strpbrk(arg, ";=@+%");
 	if (ptr && *ptr == '=') {	/* Event name */

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,`
`329`	`329`	`fprintf(stdout, "\n\n");`
`330`	`330`	`}`
`331`	`331`
`332`		`- if (sort_order == default_sort_order &&`
	`332`	`+ if (sort_order == NULL &&`
`333`	`333`	`parent_pattern == default_parent_pattern) {`
`334`	`334`	`fprintf(stdout, "#\n# (%s)\n#\n", help);`
`335`	`335`
Original file line number	Diff line number	Diff line change
`@@ -1084,6 +1084,8 @@ static int parse_perf_probe_point(char arg, struct perf_probe_event pev)`
`1084`	`1084`	`*`
`1085`	`1085`	`* TODO:Group name support`
`1086`	`1086`	`*/`
	`1087`	`+ if (!arg)`
	`1088`	`+ return -EINVAL;`
`1087`	`1089`
`1088`	`1090`	`ptr = strpbrk(arg, ";=@+%");`
`1089`	`1091`	`if (ptr && ptr == '=') { / Event name */`