I don't know if fix is functional correct, but at least it compiles now. It failed before with a config for an AMD CPU.

Bug was introduced with commit d01b1f96a82e5dd7841a1d39db3abfdaf95f70ab "perf/x86/intel: Make cpuc allocations consistent" which was merged with 004cc08675b761fd82288bab1b5ba5e1ca746eca.

Signed-off-by: Alexander Holler holler@ahsoftware.de Cc: Peter Zijlstra (Intel) peterz@infradead.org Cc: Thomas Gleixner tglx@linutronix.de Cc: stable@vger.kernel.org --- arch/x86/events/perf_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index b04ae6c..a759557 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -1033,12 +1033,12 @@ static inline int intel_pmu_init(void) return 0; }

-static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu) +static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu) { return 0; }

-static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc) +static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc) { }