From ddd8024d0dfdb4d4d4a00bf4fae2165118afc034 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <cody@linux.vnet.ibm.com>
Date: Fri, 10 Aug 2012 15:22:50 -0700
Subject: [PATCH] --- yaml --- r: 323673 b: refs/heads/master c:
 0f75a710dfd8fd5cd9e558e3f26c474c8fa63e3c h: refs/heads/master i:   323671:
 0e6d611c193a6a0119cc87b7dc61e5daebd98c4b v: v3

---
 [refs]                      | 2 +-
 trunk/tools/perf/util/map.c | 8 --------
 trunk/tools/perf/util/map.h | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d21f3ff3b466..c1e30d3f81a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8db24c70ab43a4dd38c39b0b0cb4d4874257de55
+refs/heads/master: 0f75a710dfd8fd5cd9e558e3f26c474c8fa63e3c
diff --git a/trunk/tools/perf/util/map.c b/trunk/tools/perf/util/map.c
index 287cb3452b4b..7d37159c1e99 100644
--- a/trunk/tools/perf/util/map.c
+++ b/trunk/tools/perf/util/map.c
@@ -262,14 +262,6 @@ u64 map__rip_2objdump(struct map *map, u64 rip)
 	return addr;
 }
 
-u64 map__objdump_2ip(struct map *map, u64 addr)
-{
-	u64 ip = map->dso->adjust_symbols ?
-			addr :
-			map->unmap_ip(map, addr);	/* RIP -> IP */
-	return ip;
-}
-
 void map_groups__init(struct map_groups *mg)
 {
 	int i;
diff --git a/trunk/tools/perf/util/map.h b/trunk/tools/perf/util/map.h
index c98ab1900608..25ab4cdbc446 100644
--- a/trunk/tools/perf/util/map.h
+++ b/trunk/tools/perf/util/map.h
@@ -104,7 +104,6 @@ static inline u64 identity__map_ip(struct map *map __used, u64 ip)
 
 /* rip/ip <-> addr suitable for passing to `objdump --start-address=` */
 u64 map__rip_2objdump(struct map *map, u64 rip);
-u64 map__objdump_2ip(struct map *map, u64 addr);
 
 struct symbol;