From eedacddfdfdc891daf143a46d43c45e7460a8a41 Mon Sep 17 00:00:00 2001
From: Jovi Zhang <bookjovi@gmail.com>
Date: Tue, 17 Jul 2012 10:14:41 +0800
Subject: [PATCH] --- yaml --- r: 320467 b: refs/heads/master c:
 35d56ca9d401d9d0ac8d91e4db1485af5f38f6fd h: refs/heads/master i:   320465:
 1651f9d907834fa86d3d4e21410c35bf79cbc81d   320463:
 c6d86850f0387d8bd3eaffbfe285d66d75194536 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/x86/include/asm/perf_event.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ef1dc6bce837..827d155fe712 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1ece48cf7ec07c6b3e093a4036b54bc6078f782
+refs/heads/master: 35d56ca9d401d9d0ac8d91e4db1485af5f38f6fd
diff --git a/trunk/arch/x86/include/asm/perf_event.h b/trunk/arch/x86/include/asm/perf_event.h
index c78f14a0df00..dab39350e51e 100644
--- a/trunk/arch/x86/include/asm/perf_event.h
+++ b/trunk/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;