aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tools
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-04-12 07:28:25 +0200
committerIngo Molnar <mingo@kernel.org>2017-04-12 07:28:25 +0200
commit1c4f8ad81c7f13314e4357550be9d5be3754fed9 (patch)
tree39ad0f2e75548d8becd85e84bc40cb95e155c397 /tools
parentperf/amd/uncore: Fix pr_fmt() prefix (diff)
parentMerge tag 'perf-urgent-for-mingo-4.11-20170411' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff)
downloadwireguard-linux-1c4f8ad81c7f13314e4357550be9d5be3754fed9.tar.xz
wireguard-linux-1c4f8ad81c7f13314e4357550be9d5be3754fed9.zip
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-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)