diff options
| author |   Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 11:07:14 +1000 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /tools/perf/util | |
| parent | Merge tag 'drm-misc-next-fixes-2017-04-12' of git://anongit.freedesktop.org/git/drm-misc into drm-next (diff) | |
| parent | Linux 4.11-rc7 (diff) | |
| download | linux-dev-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz linux-dev-856ee92e8602bd86d34388ac08381c5cb3918756.zip | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'tools/perf/util')
| -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 273f21fa32b5..7aa57225cbf7 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) |