diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-23 17:43:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-23 17:43:35 +0100 |
| commit | bb236de5d9509c1c6ea5ce0680f000002e731ee2 (patch) | |
| tree | c2f97ab6907d5996d259e9f11eb6faf0456fc8ef /tools/perf/util/header.c | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
| parent | 578c03c86fadcc6fd7319ddf41dd4d1d88aab77a (diff) | |
| download | linux-bb236de5d9509c1c6ea5ce0680f000002e731ee2.tar.gz linux-bb236de5d9509c1c6ea5ce0680f000002e731ee2.tar.bz2 linux-bb236de5d9509c1c6ea5ce0680f000002e731ee2.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf tooling fixes and updates from Arnaldo Carvalho de Melo:
* Fix JIT symbol resolution on heap (Namhyung Kim)
* Fix wrong SVG height in 'timechart' (Stanislav Fomichev)
* Free temp cpu_map in perf_session__cpu_bitmap (Stanislav Fomichev)
* Fix NULL pointer reference bug with event unit in 'stat' (Stephane Eranian)
* Fix memory corruption of xyarray when cpumask is used (Stephane Eranian)
* Ensure sscanf does not overrun the "mem" field (Alan Cox)
* Add support for the xtensa architecture (Baruch Siach)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/header.c')
| -rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index bb3e0ede6183..893f8e2df928 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -930,7 +930,7 @@ static int write_topo_node(int fd, int node) /* skip over invalid lines */ if (!strchr(buf, ':')) continue; - if (sscanf(buf, "%*s %*d %s %"PRIu64, field, &mem) != 2) + if (sscanf(buf, "%*s %*d %31s %"PRIu64, field, &mem) != 2) goto done; if (!strcmp(field, "MemTotal:")) mem_total = mem; |