diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-12 07:28:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-12 07:28:25 +0200 |
| commit | 1c4f8ad81c7f13314e4357550be9d5be3754fed9 (patch) | |
| tree | 39ad0f2e75548d8becd85e84bc40cb95e155c397 /tools/perf/util/annotate.c | |
| parent | 9df9078ef2086652647248ee6e82ca8f661cb3f5 (diff) | |
| parent | 0718b334068475d5eac4e25f1a88981880917f1d (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 6 |
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) |