diff options
author | Peter Zijlstra | 2019-03-15 03:14:10 -0500 |
---|---|---|
committer | Ingo Molnar | 2019-03-15 07:12:42 -0500 |
commit | f764c58b7faa26f5714e6907f892abc2bc0de4f8 (patch) | |
tree | df20e4d6e28b4c39c67dac49be0f5d22af2f2d67 | |
parent | ede271b059463731cbd6dffe55ffd70d7dbe8392 (diff) | |
download | kishons-ti-linux-kernel-f764c58b7faa26f5714e6907f892abc2bc0de4f8.tar.gz kishons-ti-linux-kernel-f764c58b7faa26f5714e6907f892abc2bc0de4f8.tar.xz kishons-ti-linux-kernel-f764c58b7faa26f5714e6907f892abc2bc0de4f8.zip |
perf/x86: Fixup typo in stub functions
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: d01b1f96a82e ("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>
-rw-r--r-- | arch/x86/events/perf_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index b04ae6c8775e..a75955741c50 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) | |||
1033 | return 0; | 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 | return 0; | 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 | ||