Skip to content

Commit

Permalink
perf annotate s390: Fix perf annotate error -95 (4.10 regression)
Browse files Browse the repository at this point in the history
since 4.10 perf annotate exits on s390 with an "unknown error -95".
Turns out that commit 786c1b5 ("perf annotate: Start supporting
cross arch annotation") added a hard requirement for architecture
support when objdump is used but only provided x86 and arm support.
Meanwhile power was added so lets add s390 as well.

While at it make sure to implement the branch and jump types.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-s390 <linux-s390@vger.kernel.org>
Cc: stable@kernel.org # v4.10+
Fixes: 786c1b5 "perf annotate: Start supporting cross arch annotation"
Link: http://lkml.kernel.org/r/1491465112-45819-2-git-send-email-borntraeger@de.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Christian Borntraeger authored and Arnaldo Carvalho de Melo committed Apr 7, 2017
1 parent a01851f commit 3c1a427
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions tools/perf/util/annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ static struct arch architectures[] = {
.name = "powerpc",
.init = powerpc__annotate_init,
},
{
.name = "s390",
.objdump = {
.comment_char = '#',
},
},
};

static void ins__delete(struct ins_operands *ops)
Expand Down

0 comments on commit 3c1a427

Please sign in to comment.