From 1cd1a33a3ebf106e2fcb53c04feddf9aa2da21b5 Mon Sep 17 00:00:00 2001
From: David Miller <davem@davemloft.net>
Date: Sun, 25 Mar 2012 16:28:12 -0400
Subject: [PATCH] --- yaml --- r: 298347 b: refs/heads/master c:
 f40a06339fe6f4809b5851a74aae2c0dc4386e1b h: refs/heads/master i:   298345:
 b63cc445efb9d0f7f53e7ef1ceec128d26c0dbb8   298343:
 5b5c97633d676af6a398aaa9e410170cd7568507 v: v3

---
 [refs]                           | 2 +-
 trunk/tools/perf/util/annotate.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 968523b43221..1ae9f9a74abf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba28c59bc9ed8fb7b9a753cd88ee54a2c4f6265b
+refs/heads/master: f40a06339fe6f4809b5851a74aae2c0dc4386e1b
diff --git a/trunk/tools/perf/util/annotate.c b/trunk/tools/perf/util/annotate.c
index e5a462f1d07c..31ba2a20c0fb 100644
--- a/trunk/tools/perf/util/annotate.c
+++ b/trunk/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;