]>
Commit | Line | Data |
---|---|---|
da17840d GKH |
1 | From f764c58b7faa26f5714e6907f892abc2bc0de4f8 Mon Sep 17 00:00:00 2001 |
2 | From: Peter Zijlstra <peterz@infradead.org> | |
3 | Date: Fri, 15 Mar 2019 09:14:10 +0100 | |
4 | Subject: perf/x86: Fixup typo in stub functions | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | From: Peter Zijlstra <peterz@infradead.org> | |
10 | ||
11 | commit f764c58b7faa26f5714e6907f892abc2bc0de4f8 upstream. | |
12 | ||
13 | Guenter reported a build warning for CONFIG_CPU_SUP_INTEL=n: | |
14 | ||
15 | > With allmodconfig-CONFIG_CPU_SUP_INTEL, this patch results in: | |
16 | > | |
17 | > In file included from arch/x86/events/amd/core.c:8:0: | |
18 | > 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 | |
19 | > static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu) | |
20 | ||
21 | While harmless (an unsed pointer is an unused pointer, no matter the type) | |
22 | it needs fixing. | |
23 | ||
24 | Reported-by: Guenter Roeck <linux@roeck-us.net> | |
25 | Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> | |
26 | Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
27 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
28 | Cc: Peter Zijlstra <peterz@infradead.org> | |
29 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
30 | Cc: stable@vger.kernel.org | |
31 | Fixes: d01b1f96a82e ("perf/x86/intel: Make cpuc allocations consistent") | |
32 | Link: http://lkml.kernel.org/r/20190315081410.GR5996@hirez.programming.kicks-ass.net | |
33 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
34 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
35 | ||
36 | --- | |
37 | arch/x86/events/perf_event.h | 4 ++-- | |
38 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
39 | ||
40 | --- a/arch/x86/events/perf_event.h | |
41 | +++ b/arch/x86/events/perf_event.h | |
42 | @@ -996,12 +996,12 @@ static inline int intel_pmu_init(void) | |
43 | return 0; | |
44 | } | |
45 | ||
46 | -static inline int intel_cpuc_prepare(struct cpu_hw_event *cpuc, int cpu) | |
47 | +static inline int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu) | |
48 | { | |
49 | return 0; | |
50 | } | |
51 | ||
52 | -static inline void intel_cpuc_finish(struct cpu_hw_event *cpuc) | |
53 | +static inline void intel_cpuc_finish(struct cpu_hw_events *cpuc) | |
54 | { | |
55 | } | |
56 |