diff options
| author | Julia Cartwright <julia@ni.com> | 2018-12-20 15:24:00 -0600 |
|---|---|---|
| committer | Julia Cartwright <julia@ni.com> | 2018-12-20 15:24:00 -0600 |
| commit | 282381a8268f5500987e6b16a4707cdb0ae82b07 (patch) | |
| tree | a48faa6461c13e6e2f662195d6db4d6278a38868 /arch/x86/events/intel/lbr.c | |
| parent | 4da09c37d8651327a9877f89652d7e56db5009f5 (diff) | |
| parent | 3622426cc93ab5bc75fa9cf2e897441dff894c34 (diff) | |
Merge tag 'v4.9.132' into v4.9-rt
This is the 4.9.132 stable release
Diffstat (limited to 'arch/x86/events/intel/lbr.c')
| -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 2c3c7abf678b..10c1a5c448e5 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -1195,4 +1195,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; } |