---

yaml --- r: 320467 b: refs/heads/master c: 35d56ca h: refs/heads/master i: 320465: 1651f9d 320463: c6d8685 v: v3
git-mirror · Jul 26, 2012 · eedacdd · eedacdd
1 parent e4e4ccd
commit eedacdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;