Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753038AbdDLFon (ORCPT ); Wed, 12 Apr 2017 01:44:43 -0400 Received: from terminus.zytor.com ([65.50.211.136]:34547 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbdDLFol (ORCPT ); Wed, 12 Apr 2017 01:44:41 -0400 Date: Tue, 11 Apr 2017 22:42:33 -0700 From: tip-bot for Taeung Song Message-ID: Cc: jolsa@kernel.org, treeze.taeung@gmail.com, ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, mingo@kernel.org Reply-To: jolsa@kernel.org, treeze.taeung@gmail.com, ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, acme@redhat.com, mingo@kernel.org In-Reply-To: <1491612748-1605-3-git-send-email-treeze.taeung@gmail.com> References: <1491612748-1605-3-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Use stripped line instead of raw disassemble line Git-Commit-ID: 986a5bc028a84d487c354a529730b48682d1fb41 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1464 Lines: 37 Commit-ID: 986a5bc028a84d487c354a529730b48682d1fb41 Gitweb: http://git.kernel.org/tip/986a5bc028a84d487c354a529730b48682d1fb41 Author: Taeung Song AuthorDate: Sat, 8 Apr 2017 09:52:25 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 11 Apr 2017 16:22:23 -0300 perf annotate: Use stripped line instead of raw disassemble line When parsing disassemble lines for source line number, use a stripped line instead of raw line. Signed-off-by: Taeung Song Cc: Andi Kleen Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/1491612748-1605-3-git-send-email-treeze.taeung@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 204790d..30498a2 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1159,8 +1159,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, parsed_line = rtrim(line); /* /filename:linenr ? Save line number and ignore. */ - if (regexec(&file_lineno, line, 2, match, 0) == 0) { - *line_nr = atoi(line + match[1].rm_so); + if (regexec(&file_lineno, parsed_line, 2, match, 0) == 0) { + *line_nr = atoi(parsed_line + match[1].rm_so); return 0; }