diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-23 20:43:35 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-23 20:43:35 +0400 |
| commit | bb236de5d9509c1c6ea5ce0680f000002e731ee2 (patch) | |
| tree | c2f97ab6907d5996d259e9f11eb6faf0456fc8ef /tools/perf/util/map.c | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
| parent | 578c03c86fadcc6fd7319ddf41dd4d1d88aab77a (diff) | |
| download | linux-bb236de5d9509c1c6ea5ce0680f000002e731ee2.tar.xz | |
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/map.c')
| -rw-r--r-- | tools/perf/util/map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 9b9bd719aa19..ee1dd687a262 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -69,7 +69,7 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, map->ino = ino; map->ino_generation = ino_gen; - if (anon) { + if ((anon || no_dso) && type == MAP__FUNCTION) { snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid); filename = newfilename; } @@ -93,7 +93,7 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len, * functions still return NULL, and we avoid the * unnecessary map__load warning. */ - if (no_dso) + if (type != MAP__FUNCTION) dso__set_loaded(dso, map->type); } } |