Skip to content

Commit 535adf2

Browse files
borntraegergregkh
authored andcommitted
perf annotate s390: Fix perf annotate error -95 (4.10 regression)
commit 3c1a427 upstream. 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 <[email protected]> Cc: Andreas Krebbel <[email protected]> Cc: Hendrik Brueckner <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: linux-s390 <[email protected]> Fixes: 786c1b5 "perf annotate: Start supporting cross arch annotation" Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7869b40 commit 535adf2

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

tools/perf/util/annotate.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ static struct arch architectures[] = {
130130
.name = "powerpc",
131131
.init = powerpc__annotate_init,
132132
},
133+
{
134+
.name = "s390",
135+
.objdump = {
136+
.comment_char = '#',
137+
},
138+
},
133139
};
134140

135141
static void ins__delete(struct ins_operands *ops)

0 commit comments

Comments
 (0)