aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/annotate.c
diff options
context:
space:
mode:
authorChristian Borntraeger <[email protected]>2017-04-06 07:51:51 +0000
committerArnaldo Carvalho de Melo <[email protected]>2017-04-11 18:23:39 +0000
commite77852b32d6d4430c68c38aaf73efe5650fa25af (patch)
tree4fdc87ea07d6ea8be03ea2f537b62512817dbff5 /tools/perf/util/annotate.c
parentperf string: Simplify ltrim() implementation (diff)
downloadkernel-e77852b32d6d4430c68c38aaf73efe5650fa25af.tar.gz
kernel-e77852b32d6d4430c68c38aaf73efe5650fa25af.zip
perf annotate s390: Fix perf annotate error -95 (4.10 regression)
since 4.10 perf annotate exits on s390 with an "unknown error -95". Turns out that commit 786c1b51844d ("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]> Cc: [email protected] # v4.10+ Fixes: 786c1b51844 "perf annotate: Start supporting cross arch annotation" Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r--tools/perf/util/annotate.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index a37032bd137d..bfb2f1d393d5 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -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)