From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969Ab3JGGns (ORCPT ); Mon, 7 Oct 2013 02:43:48 -0400 Received: from mga09.intel.com ([134.134.136.24]:51044 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752004Ab3JGGnp (ORCPT ); Mon, 7 Oct 2013 02:43:45 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1048,1371106800"; d="scan'208";a="388846098" From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , linux-kernel@vger.kernel.org, David Ahern , Frederic Weisbecker , Jiri Olsa , Mike Galbraith , Namhyung Kim , Paul Mackerras , Stephane Eranian Subject: [PATCH V4 6/9] perf tools: find kcore symbols on other maps Date: Mon, 7 Oct 2013 09:50:15 +0300 Message-Id: <1381128618-22721-7-git-send-email-adrian.hunter@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1381128618-22721-1-git-send-email-adrian.hunter@intel.com> References: <1381128618-22721-1-git-send-email-adrian.hunter@intel.com> Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the new map__find_other_map_symbol() to find kcore symbols on other maps. Signed-off-by: Adrian Hunter --- tools/perf/util/annotate.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 46746b8..6cb7277 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -825,20 +825,15 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, dl->ops.target.offset = dl->ops.target.addr - map__rip_2objdump(map, sym->start); - /* - * kcore has no symbols, so add the call target name if it is on the - * same map. - */ + /* kcore has no symbols, so add the call target name */ if (dl->ins && ins__is_call(dl->ins) && !dl->ops.target.name) { + struct map *map_ptr = map; struct symbol *s; u64 ip = dl->ops.target.addr; - if (ip >= map->start && ip <= map->end) { - ip = map->map_ip(map, ip); - s = map__find_symbol(map, ip, NULL); - if (s && s->start == ip) - dl->ops.target.name = strdup(s->name); - } + s = map__find_other_map_symbol(&map_ptr, &ip, NULL); + if (s && s->start == ip) + dl->ops.target.name = strdup(s->name); } disasm__add(¬es->src->source, dl); -- 1.7.11.7