diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-23 10:03:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-23 10:03:27 +0200 |
| commit | 977282ed17a0213c84d59498a1e3f7088e211470 (patch) | |
| tree | 97f1766246ce07bc230516b11b31603deaf93bcb | |
| parent | fb3a5055cd7098f8d1dd0cd38d7172211113255f (diff) | |
| parent | 7598f8bc1383ffd77686cb4e92e749bef3c75937 (diff) | |
| download | linux-977282ed17a0213c84d59498a1e3f7088e211470.tar.gz linux-977282ed17a0213c84d59498a1e3f7088e211470.tar.bz2 linux-977282ed17a0213c84d59498a1e3f7088e211470.zip | |
Merge tag 'perf-urgent-for-mingo-4.12-20170622' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull 'perf probe' fix from Arnaldo Carvalho de Melo:
- Do not double the offset of inline expansions when using
'perf probe' on inlined functions (Björn Töpel)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/perf/util/probe-event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 84e7e698411e..a2670e9d652d 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -619,7 +619,7 @@ static int post_process_probe_trace_point(struct probe_trace_point *tp, struct map *map, unsigned long offs) { struct symbol *sym; - u64 addr = tp->address + tp->offset - offs; + u64 addr = tp->address - offs; sym = map__find_symbol(map, addr); if (!sym) |