summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChris Ryder <chris.ryder@arm.com>2016-05-19 17:59:45 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-05-20 11:43:57 -0300
commit58c0400176b2cd35da43f3115fa94ca937483aca (patch)
tree1cd1dadde671feeb3daedfcee24df01aa1882098 /tools
parentfe176085a4d45fb241c04beea872ecbb8bef6a55 (diff)
downloadlinux-stable-58c0400176b2cd35da43f3115fa94ca937483aca.tar.gz
linux-stable-58c0400176b2cd35da43f3115fa94ca937483aca.tar.bz2
linux-stable-58c0400176b2cd35da43f3115fa94ca937483aca.zip
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 <chris.ryder@arm.com> Acked-by: Pawel Moll <pawel.moll@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/560e196b7c79b7ff853caae13d8719a31479cb1a.1463676839.git.chris.ryder@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/annotate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index b811924e5e1b..3d9f2ca2ed2d 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