From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934570AbcLBKou (ORCPT ); Fri, 2 Dec 2016 05:44:50 -0500 Received: from terminus.zytor.com ([198.137.202.10]:42042 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751786AbcLBKos (ORCPT ); Fri, 2 Dec 2016 05:44:48 -0500 Date: Fri, 2 Dec 2016 02:44:10 -0800 From: tip-bot for Kim Phillips Message-ID: Cc: alexander.shishkin@linux.intel.com, acme@redhat.com, hpa@zytor.com, peterz@infradead.org, chris.ryder@arm.com, will.deacon@arm.com, mark.rutland@arm.com, kim.phillips@arm.com, pawel.moll@arm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org Reply-To: peterz@infradead.org, mark.rutland@arm.com, will.deacon@arm.com, chris.ryder@arm.com, alexander.shishkin@linux.intel.com, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, pawel.moll@arm.com, mingo@kernel.org, tglx@linutronix.de, kim.phillips@arm.com In-Reply-To: <20161130092333.1cca5dd2c77e1790d61c1e9c@arm.com> References: <20161130092333.1cca5dd2c77e1790d61c1e9c@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Use arch->objdump.comment_char in dec__parse() Git-Commit-ID: 859afa6ca9321346800bac0ee478c9a99c4babaf 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 Commit-ID: 859afa6ca9321346800bac0ee478c9a99c4babaf Gitweb: http://git.kernel.org/tip/859afa6ca9321346800bac0ee478c9a99c4babaf Author: Kim Phillips AuthorDate: Wed, 30 Nov 2016 09:23:33 -0600 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 1 Dec 2016 13:03:18 -0300 perf annotate: Use arch->objdump.comment_char in dec__parse() Presume neglected in commit 786c1b5 "perf annotate: Start supporting cross arch annotation". This doesn't fix a bug since none of the affected arches support parsing dec/inc instructions yet. Signed-off-by: Kim Phillips Cc: Alexander Shishkin Cc: Chris Ryder Cc: Mark Rutland Cc: Pawel Moll Cc: Peter Zijlstra Cc: Will Deacon Link: http://lkml.kernel.org/r/20161130092333.1cca5dd2c77e1790d61c1e9c@arm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 3e34ee0..191599e 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -408,7 +408,7 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *ops if (ops->target.raw == NULL) return -1; - comment = strchr(s, '#'); + comment = strchr(s, arch->objdump.comment_char); if (comment == NULL) return 0;