diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
| commit | fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3 (patch) | |
| tree | 7d3a08a88aad2e7541231f0241d97e64df4a4208 /arch/x86/events | |
| parent | 49e73246cbe6fe0df9cae2db87f31cdc3a0b2b61 (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
Merge tag 'v4.19-rc5' 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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index f3e006bed9a7..c88ed39582a1 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -1272,4 +1272,8 @@ void intel_pmu_lbr_init_knl(void) x86_pmu.lbr_sel_mask = LBR_SEL_MASK; x86_pmu.lbr_sel_map = snb_lbr_sel_map; + + /* Knights Landing does have MISPREDICT bit */ + if (x86_pmu.intel_cap.lbr_format == LBR_FORMAT_LIP) + x86_pmu.intel_cap.lbr_format = LBR_FORMAT_EIP_FLAGS; } |