Commit 977282ed authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo-4.12-20170622' of...

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fb3a5055 7598f8bc
...@@ -619,7 +619,7 @@ static int post_process_probe_trace_point(struct probe_trace_point *tp, ...@@ -619,7 +619,7 @@ static int post_process_probe_trace_point(struct probe_trace_point *tp,
struct map *map, unsigned long offs) struct map *map, unsigned long offs)
{ {
struct symbol *sym; struct symbol *sym;
u64 addr = tp->address + tp->offset - offs; u64 addr = tp->address - offs;
sym = map__find_symbol(map, addr); sym = map__find_symbol(map, addr);
if (!sym) if (!sym)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment