Messages in this thread Patch in this message | | | Date | Thu, 26 Jul 2012 08:17:17 -0700 | From | tip-bot for Jovi Zhang <> | Subject | [tip:perf/core] perf/x86: Fix missing struct before structure name |
| |
Commit-ID: 35d56ca9d401d9d0ac8d91e4db1485af5f38f6fd Gitweb: http://git.kernel.org/tip/35d56ca9d401d9d0ac8d91e4db1485af5f38f6fd Author: Jovi Zhang <bookjovi@gmail.com> AuthorDate: Tue, 17 Jul 2012 10:14:41 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Thu, 26 Jul 2012 15:04:34 +0200
perf/x86: Fix missing struct before structure name
When CONFIG_PERF_EVENTS disabled, there will have a compiliation error, because missing struct before structure name.
Signed-off-by: Jovi Zhang <bookjovi@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Jiri Kosina <trivial@kernel.org> Link: http://lkml.kernel.org/r/CACV3sbKF%3DCX%2B2jWEWesfCA6rBoQ3wDM4-5ac9MuBtVbCtMRHdQ@mail.gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/include/asm/perf_event.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index c78f14a..dab3935 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -234,7 +234,7 @@ extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap); extern void perf_check_microcode(void); #else -static inline perf_guest_switch_msr *perf_guest_get_msrs(int *nr) +static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr) { *nr = 0; return NULL;
| |