diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-29 11:34:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-29 11:34:41 +0200 |
| commit | d905768c9e1addfa35d9731dbaa9242e8991f6ac (patch) | |
| tree | f80cc76eaf80b553799fa93358054fbfb94907e3 /tools/perf/util/symbol.c | |
| parent | d4cf1949f9689314aef962eea95df84a8288d097 (diff) | |
| parent | ebccba3fe0a02f622f80e6be0e8ecb1a9a3ed983 (diff) | |
| download | linux-d905768c9e1addfa35d9731dbaa9242e8991f6ac.tar.gz linux-d905768c9e1addfa35d9731dbaa9242e8991f6ac.tar.xz | |
Merge tag 'perf-core-for-mingo-20160628' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
New features:
- Generate comm, fork and exit events when converting perf.data files to CTF (Wang Nan)
Infrastructure changes:
- Add libbabeltrace to build-test (Wang Nan)
- 'perf record' prep work to support multiple evlists (Wang Nan)
- Remove unused hist_entry__annotate function (Ravi Bangoria)
- Add more toolchain triplets (Ravi Bangoria)
- Update message for slang devel packages on Ubuntu (Neeraj Badlani)
- Generalize handling of 'ret' instructions in the annotate TUI (Naveen N. Rao)
- Use proper dso name for is_regular_file, fixing device file handling (Jiri Olsa)
Build Fixes:
- Add missing config.h include, fixing the build with libbabeltrace (Jiri Olsa)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/symbol.c')
| -rw-r--r-- | tools/perf/util/symbol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index b044f1a32d16..37e8d20ae03e 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1430,7 +1430,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) * Read the build id if possible. This is required for * DSO_BINARY_TYPE__BUILDID_DEBUGINFO to work */ - if (is_regular_file(name) && + if (is_regular_file(dso->long_name) && filename__read_build_id(dso->long_name, build_id, BUILD_ID_SIZE) > 0) dso__set_build_id(dso, build_id); |