From 8fdb8a6681bad898f0859503cd55600774c077fa Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 27 Jan 2011 19:23:20 +0100
Subject: [PATCH] --- yaml --- r: 234365 b: refs/heads/master c:
 d380eaaea70d775c0520dcb5702ea5d2a56b7be9 h: refs/heads/master i:   234363:
 f7791a2116ae178ea98083e983c2d7fefb25a9d9 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6bc5696cbfb0..2e791d34cdc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef1d1af28ca37fdbc2745da040529cd2953c1af5
+refs/heads/master: d380eaaea70d775c0520dcb5702ea5d2a56b7be9
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
index 9d977a2ea693..4d98789b0664 100644
--- a/trunk/arch/x86/kernel/cpu/perf_event.c
+++ b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -1389,7 +1389,7 @@ static void __init pmu_check_apic(void)
 	pr_info("no hardware sampling interrupt available.\n");
 }
 
-int __init init_hw_perf_events(void)
+static int __init init_hw_perf_events(void)
 {
 	struct event_constraint *c;
 	int err;
@@ -1608,7 +1608,7 @@ static int validate_group(struct perf_event *event)
 	return ret;
 }
 
-int x86_pmu_event_init(struct perf_event *event)
+static int x86_pmu_event_init(struct perf_event *event)
 {
 	struct pmu *tmp;
 	int err;