[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-f40a06339fe6f4809b5851a74aae2c0dc4386e1b@git.kernel.org>
Date: Sat, 31 Mar 2012 00:45:04 -0700
From: tip-bot for David Miller <davem@...emloft.net>
To: linux-tip-commits@...r.kernel.org
Cc: acme@...hat.com, linux-kernel@...r.kernel.org, hpa@...or.com,
mingo@...nel.org, tglx@...utronix.de, davem@...emloft.net
Subject: [tip:perf/urgent] perf annotate:
addr2line wants addresses in same format as objdump
Commit-ID: f40a06339fe6f4809b5851a74aae2c0dc4386e1b
Gitweb: http://git.kernel.org/tip/f40a06339fe6f4809b5851a74aae2c0dc4386e1b
Author: David Miller <davem@...emloft.net>
AuthorDate: Sun, 25 Mar 2012 16:28:12 -0400
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Wed, 28 Mar 2012 12:06:24 -0300
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@...emloft.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/annotate.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists