From: Dapeng Mi Now that KVM has switched to bitmap-based PMU capabilities, num_counters_{gp,fixed} can be removed from x86_pmu_capability. Signed-off-by: Dapeng Mi Signed-off-by: Zide Chen --- arch/x86/events/core.c | 2 -- arch/x86/include/asm/perf_event.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 65349819ba43..5bcd2a48d2b3 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -3132,8 +3132,6 @@ void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap) * base PMU holds the correct number of counters for P-cores. */ cap->version = x86_pmu.version; - cap->num_counters_gp = x86_pmu_num_counters(NULL); - cap->num_counters_fixed = x86_pmu_num_counters_fixed(NULL); cap->cntr_mask64 = x86_pmu.cntr_mask64; cap->fixed_cntr_mask64 = x86_pmu.fixed_cntr_mask64; cap->bit_width_gp = cap->cntr_mask64 ? x86_pmu.cntval_bits : 0; diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index f59a3d466195..4b035629903c 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -300,8 +300,6 @@ union cpuid_0x80000022_ebx { struct x86_pmu_capability { int version; - int num_counters_gp; - int num_counters_fixed; union { u64 cntr_mask64; DECLARE_BITMAP(cntr_mask, X86_PMC_IDX_MAX); -- 2.54.0