diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-02-13 15:59:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-13 15:59:19 -0800 |
| commit | 785e337e69484af1ada967bc41ae778c413695dd (patch) | |
| tree | 00056309c227359bb88367cf4bd9c726341ca9ce /tools | |
| parent | e2a34f151c7bc7adb99fb673973fbef69e63dce6 (diff) | |
| parent | b4248fb5b9970c6c6ae704c5e910250170608c8d (diff) | |
Merge "Merge android-4.4.173 (64b5644) into msm-4.4"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/unwind-libdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c index 60edec383281..bf5ee8906fb2 100644 --- a/tools/perf/util/unwind-libdw.c +++ b/tools/perf/util/unwind-libdw.c @@ -41,13 +41,13 @@ static int __report_module(struct addr_location *al, u64 ip, Dwarf_Addr s; dwfl_module_info(mod, NULL, &s, NULL, NULL, NULL, NULL, NULL); - if (s != al->map->start) + if (s != al->map->start - al->map->pgoff) mod = 0; } if (!mod) mod = dwfl_report_elf(ui->dwfl, dso->short_name, - dso->long_name, -1, al->map->start, + (dso->symsrc_filename ? dso->symsrc_filename : dso->long_name), -1, al->map->start - al->map->pgoff, false); return mod && dwfl_addrmodule(ui->dwfl, ip) == mod ? 0 : -1; |