From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932297AbdEDR4k (ORCPT ); Thu, 4 May 2017 13:56:40 -0400 Received: from terminus.zytor.com ([65.50.211.136]:36641 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752845AbdEDR4d (ORCPT ); Thu, 4 May 2017 13:56:33 -0400 Date: Thu, 4 May 2017 10:50:21 -0700 From: tip-bot for Kim Phillips Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, chris.ryder@arm.com, alexander.shishkin@linux.intel.com, acme@redhat.com, peterz@infradead.org, kim.phillips@arm.com, linux-kernel@vger.kernel.org Reply-To: acme@redhat.com, chris.ryder@arm.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, alexander.shishkin@linux.intel.com, kim.phillips@arm.com, peterz@infradead.org, linux-kernel@vger.kernel.org In-Reply-To: <20170503131356.be88f977094fb3fa0f49b99d@arm.com> References: <20170503131356.be88f977094fb3fa0f49b99d@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Fix AArch64 comment char Git-Commit-ID: d1f7b0234ec7743899321aaaba379b2f5f9d0500 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: d1f7b0234ec7743899321aaaba379b2f5f9d0500 Gitweb: http://git.kernel.org/tip/d1f7b0234ec7743899321aaaba379b2f5f9d0500 Author: Kim Phillips AuthorDate: Wed, 3 May 2017 13:13:56 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 4 May 2017 10:03:00 -0300 perf annotate: Fix AArch64 comment char The commit 0fcb1da4aba "perf annotate: AArch64 support" blindly copied the comment character from the original: https://lkml.org/lkml/2016/5/19/461 whereas that same commit shows objdump output utilizing the C++ style "//" as the comment delimeter. Since '/' doesn't occur elsewhere in objdump output, we retain the single character check, but fix it to be '/'. Signed-off-by: Kim Phillips Cc: Alexander Shishkin Cc: Chris Riyder Cc: Peter Zijlstra Fixes: 0fcb1da4aba6 ("perf annotate: AArch64 support") Link: http://lkml.kernel.org/r/20170503131356.be88f977094fb3fa0f49b99d@arm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/arm64/annotate/instructions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c index 44eafd6..8f19087 100644 --- a/tools/perf/arch/arm64/annotate/instructions.c +++ b/tools/perf/arch/arm64/annotate/instructions.c @@ -50,7 +50,7 @@ static int arm64__annotate_init(struct arch *arch) arch->initialized = true; arch->priv = arm; arch->associate_instruction_ops = arm64__associate_instruction_ops; - arch->objdump.comment_char = ';'; + arch->objdump.comment_char = '/'; arch->objdump.skip_functions_char = '+'; return 0;