korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 01:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf/urgent fixes:

Browse Source 
- 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>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVST9uAAoJENZQFvNTUqpADukQAJJ/s9wS+oJDNEMiMBorMWyw
 cUQISI39iIbdpuKLRv5TmgBFC9ZEnlvW9IABUyF1gXJ5q2AfEFg64AD661qRYYJ1
 zlY6st4hnM/prVyImX/Vad0gRqtvZEoEDUl07eES5iiaj2LWAX5JGKUo2j8kT6/a
 gToT0UdpyVOuRFz4m+MrFrf1BLfYFhV6vzrfp0LVFH2lJGcOpHmQOj4nSmJXZvI0
 5ieSTgBax77LEmEiXcZNimWmBGYWfDKNoofcEYI5f195Uuwwy5sUVGyhfdU/Dg7I
 sq0yIMn940SUDB0F4QTuHP4bRDCe908jTcCs+MtmzyDpjwFNLGj+/vPjtM/KBMi1
 TP1JImCYGHS013OeAm4HitwVkeQrh8noaGTSNJzkRTh7JZ9KVsyido/SnXi6dSdT
 ecdC4aaxLzPX1ifGc0x9xpjShGKpWxEaNdu2eARZ6rapRxvXwKVlbKer4Q0COKNu
 L/WHbXTPF1pKQpNlie/H5TJcHnwmIBh83bz7l+kNbfxQIIF1ci8mPQ670E3MNDs3
 DbfYBu/Wf4BxRn8jMbe3yu3g1yeujvXvtlTk62COALecayNwJtO0+DopTUm5l8dL
 JQOtp6d1g4lB/qkuj+6aYcLQ9IJeVR95+3FzBVLTVNdccbh4Y/YE3YrShAr0lz1t
 x63/VleBFbKc5HsHNi9L
 =VWb0
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Ingo Molnar 2015-05-06 04:54:11 +02:00
commit 74f40c1f43
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-report.c
View File

@ -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);

2
tools/perf/util/probe-event.c
View File

@ -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 */