From: David Miller <davem@davemloft.net>
Date: Sun, 25 Mar 2012 20:28:12 +0000 (-0400)
Subject: perf annotate: addr2line wants addresses in same format as objdump
X-Git-Tag: v3.12-rc1~3417^2~3^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f40a06339fe6f4809b5851a74aae2c0dc4386e1b;p=kernel%2Fkernel-generic.git

perf annotate: addr2line wants addresses in same format as objdump

Therefore, in symbol__get_source_line(), use map__rip_2objdump
instead of calling map->unmap_ip() unconditionally.

Link: http://lkml.kernel.org/r/20120325.162812.59519424882536855.davem@davemloft.net
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e5a462f..31ba2a2 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -408,7 +408,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
 	if (!notes->src->lines)
 		return -1;
 
-	start = map->unmap_ip(map, sym->start);
+	start = map__rip_2objdump(map, sym->start);
 
 	for (i = 0; i < len; i++) {
 		char *path = NULL;