diff options
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 698ae77d6f18..aa333d966886 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
| @@ -2308,10 +2308,7 @@ __init int intel_pmu_init(void) | |||
| 2308 | if (version > 1) | 2308 | if (version > 1) |
| 2309 | x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3); | 2309 | x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3); |
| 2310 | 2310 | ||
| 2311 | /* | 2311 | if (boot_cpu_has(X86_FEATURE_PDCM)) { |
| 2312 | * v2 and above have a perf capabilities MSR | ||
| 2313 | */ | ||
| 2314 | if (version > 1) { | ||
| 2315 | u64 capabilities; | 2312 | u64 capabilities; |
| 2316 | 2313 | ||
| 2317 | rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities); | 2314 | rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities); |
