perf/x86: Fixup typo in stub functions

Peter Zijlstra · Ingo Molnar · commit f764c58b7faa · 2019-03-15T13:12:42.000+01:00
Guenter reported a build warning for CONFIG_CPU_SUP_INTEL=n: > With allmodconfig-CONFIG_CPU_SUP_INTEL, this patch results in: > > In file included from arch/x86/events/amd/core.c:8:0: > arch/x86/events/amd/../perf_event.h:1036:45: warning: ‘struct cpu_hw_event’ declared inside parameter list will not be visible outside of this definition or declaration > static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu) While harmless (an unsed pointer is an unused pointer, no matter the type) it needs fixing. Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Fixes: d01b1f9 ("perf/x86/intel: Make cpuc allocations consistent") Link: http://lkml.kernel.org/r/20190315081410.GR5996@hirez.programming.kicks-ass.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git 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)
 {
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1033,12 +1033,12 @@ static inline int intel_pmu_init(void)`
`1033`	`1033`	`return 0;`
`1034`	`1034`	`}`
`1035`	`1035`
`1036`		`-static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu)`
	`1036`	`+static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)`
`1037`	`1037`	`{`
`1038`	`1038`	`return 0;`
`1039`	`1039`	`}`
`1040`	`1040`
`1041`		`-static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc)`
	`1041`	`+static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc)`
`1042`	`1042`	`{`
`1043`	`1043`	`}`
`1044`	`1044`