diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 16:58:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-14 16:58:38 -0700 |
| commit | 07c7016de7896493e95bef64fe913ac849509d6e (patch) | |
| tree | a4e2827002e649b2555b5575974b6c03d82e371a /tools | |
| parent | d295917a47e99fe43f1efb14261612e67120e4bb (diff) | |
| parent | f2200ac311302fcdca6556fd0c5127eab6c65a3e (diff) | |
| download | blackbird-op-linux-07c7016de7896493e95bef64fe913ac849509d6e.tar.gz blackbird-op-linux-07c7016de7896493e95bef64fe913ac849509d6e.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"Two small fixes for perf:
- the move to support cross arch annotation introduced per arch
initialization requirements, fullfill them for s/390 (Christian
Borntraeger)
- add the missing initialization to the LBR entries to avoid exposing
random or stale data"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
perf annotate s390: Fix perf annotate error -95 (4.10 regression)
Diffstat (limited to 'tools')
| -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) |
