From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbcETRqE (ORCPT ); Fri, 20 May 2016 13:46:04 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33610 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbcETRp6 (ORCPT ); Fri, 20 May 2016 13:45:58 -0400 Date: Fri, 20 May 2016 10:45:18 -0700 From: tip-bot for Chris Ryder Message-ID: Cc: will.deacon@arm.com, chris.ryder@arm.com, mingo@kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, pawel.moll@arm.com, acme@redhat.com, tglx@linutronix.de, mark.rutland@arm.com, linux-kernel@vger.kernel.org Reply-To: alexander.shishkin@linux.intel.com, hpa@zytor.com, pawel.moll@arm.com, acme@redhat.com, tglx@linutronix.de, mark.rutland@arm.com, linux-kernel@vger.kernel.org, will.deacon@arm.com, chris.ryder@arm.com, mingo@kernel.org, peterz@infradead.org In-Reply-To: <560e196b7c79b7ff853caae13d8719a31479cb1a.1463676839.git.chris.ryder@arm.com> References: <560e196b7c79b7ff853caae13d8719a31479cb1a.1463676839.git.chris.ryder@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Fix identification of ARM blt and bls instructions Git-Commit-ID: 58c0400176b2cd35da43f3115fa94ca937483aca 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: 58c0400176b2cd35da43f3115fa94ca937483aca Gitweb: http://git.kernel.org/tip/58c0400176b2cd35da43f3115fa94ca937483aca Author: Chris Ryder AuthorDate: Thu, 19 May 2016 17:59:45 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 20 May 2016 11:43:57 -0300 perf annotate: Fix identification of ARM blt and bls instructions The ARM blt and bls instructions are not correctly identified when parsing assembly because the list of recognised instructions must be sorted by name. Swap the ordering of blt and bls. Signed-off-by: Chris Ryder Acked-by: Pawel Moll Cc: Alexander Shishkin Cc: Mark Rutland Cc: Peter Zijlstra Cc: Will Deacon Link: http://lkml.kernel.org/r/560e196b7c79b7ff853caae13d8719a31479cb1a.1463676839.git.chris.ryder@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 b811924..3d9f2ca 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -372,8 +372,8 @@ static struct ins instructions[] = { { .name = "bgt", .ops = &jump_ops, }, { .name = "bhi", .ops = &jump_ops, }, { .name = "bl", .ops = &call_ops, }, - { .name = "blt", .ops = &jump_ops, }, { .name = "bls", .ops = &jump_ops, }, + { .name = "blt", .ops = &jump_ops, }, { .name = "blx", .ops = &call_ops, }, { .name = "bne", .ops = &jump_ops, }, #endif