Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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)
+9
+3
arch/x86/events/intel/lbr.c
+3
arch/x86/events/intel/lbr.c
···
507
507
cpuc->lbr_entries[i].to = msr_lastbranch.to;
508
508
cpuc->lbr_entries[i].mispred = 0;
509
509
cpuc->lbr_entries[i].predicted = 0;
510
+
cpuc->lbr_entries[i].in_tx = 0;
511
+
cpuc->lbr_entries[i].abort = 0;
512
+
cpuc->lbr_entries[i].cycles = 0;
510
513
cpuc->lbr_entries[i].reserved = 0;
511
514
}
512
515
cpuc->lbr_stack.nr = i;