[PATCH] perf tools: use map->map_ip to get srcline when listing symbol

[Yannick Brosseau]

Revert 5550171b2a9f8df26ff483051d060db06376b26d and do the address
mapping using map->map_ip instead of map__rip_2objdump when
calling get_srcline

Signed-off-by: Yannick Brosseau <scientist@xxxxxx>
---
 tools/perf/util/callchain.c | 4 ++--
 tools/perf/util/machine.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 9f643ee..359fb6b 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -830,8 +830,8 @@ char *callchain_list__sym_name(struct callchain_list *cl,
 		if (callchain_param.key == CCKEY_ADDRESS &&
 		    cl->ms.map && !cl->srcline)
 			cl->srcline = get_srcline(cl->ms.map->dso,
-						  map__rip_2objdump(cl->ms.map,
-								    cl->ip),
+						  cl->ms.map->map_ip(cl->ms.map,
+								     cl->ip),
 						  cl->ms.sym, false);
 		if (cl->srcline)
 			printed = scnprintf(bf, bfsize, "%s %s",
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 7ff6827..80a5eda 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1580,7 +1580,7 @@ static int add_callchain_ip(struct thread *thread,
 		}
 	}
 
-	return callchain_cursor_append(&callchain_cursor, al.addr, al.map, al.sym);
+	return callchain_cursor_append(&callchain_cursor, ip, al.map, al.sym);
 }
 
 struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/