summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2012-03-25 16:28:12 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-03-28 12:06:24 -0300
commitf40a06339fe6f4809b5851a74aae2c0dc4386e1b (patch)
tree54ff3daf96b62af079e77687e3b5e4ffcebb5824 /tools
parentba28c59bc9ed8fb7b9a753cd88ee54a2c4f6265b (diff)
downloadlinux-3.10-f40a06339fe6f4809b5851a74aae2c0dc4386e1b.tar.gz
linux-3.10-f40a06339fe6f4809b5851a74aae2c0dc4386e1b.tar.bz2
linux-3.10-f40a06339fe6f4809b5851a74aae2c0dc4386e1b.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/annotate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index e5a462f1d07..31ba2a20c0f 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;