diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-06-27 11:36:28 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 11:36:28 -0400 |
| commit | c048c984de38d906bb0df56ec2ae90eafc123d0a (patch) | |
| tree | 4e670e712aeedcaf2e2193b64f9120e03320e01c /tools/perf | |
| parent | DRM: Fix an incorrectly formatted table (diff) | |
| parent | Backmerge tag 'v4.12-rc7' into drm-next (diff) | |
| download | wireguard-linux-c048c984de38d906bb0df56ec2ae90eafc123d0a.tar.xz wireguard-linux-c048c984de38d906bb0df56ec2ae90eafc123d0a.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
Backmerge drm-next with rc7
Diffstat (limited to 'tools/perf')
| -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) |