diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:30:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-04-14 10:30:28 +0200 |
| commit | 18c5c7c6186eb17c5814c095ddcbb5002aec4d74 (patch) | |
| tree | 8e21d94f32ee783d9c2ac6ff0a55c048b7d4a87d /arch/x86/events | |
| parent | kprobes/x86: Consolidate insn decoder users for copying code (diff) | |
| parent | perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32() (diff) | |
| download | linux-18c5c7c6186eb17c5814c095ddcbb5002aec4d74.tar.xz linux-18c5c7c6186eb17c5814c095ddcbb5002aec4d74.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events')
| -rw-r--r-- | arch/x86/events/intel/lbr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 81b321ace8e0..f924629836a8 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].to = msr_lastbranch.to; cpuc->lbr_entries[i].mispred = 0; cpuc->lbr_entries[i].predicted = 0; + cpuc->lbr_entries[i].in_tx = 0; + cpuc->lbr_entries[i].abort = 0; + cpuc->lbr_entries[i].cycles = 0; cpuc->lbr_entries[i].reserved = 0; } cpuc->lbr_stack.nr = i; |