From 3e8b24edef331e265f2ab55c1a2b53f36055a17d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Sat, 6 Mar 2010 19:49:19 +0100
Subject: [PATCH] --- yaml --- r: 188247 b: refs/heads/master c:
 32975a4f114be52286f9a5bf6c230dbb8c0e1903 h: refs/heads/master i:   188245:
 a0018e2df6db3cf182f594f631cd4311fcdcc8fd   188243:
 6780720e2c5393db160db8d82797b2c9f72388f0   188239:
 613abeabe4d112ddb3dfb188ef30ddab63053eda v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/perf_event.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index ebf8acd75af3..5e13a10c687d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f6da3905398826d85731247e7fbcf53400c18bd
+refs/heads/master: 32975a4f114be52286f9a5bf6c230dbb8c0e1903
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 73329dedb5ad..d8108465397d 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -93,25 +93,15 @@ void __weak perf_event_print_debug(void)	{ }
 
 static DEFINE_PER_CPU(int, perf_disable_count);
 
-void __perf_disable(void)
-{
-	__get_cpu_var(perf_disable_count)++;
-}
-
-bool __perf_enable(void)
-{
-	return !--__get_cpu_var(perf_disable_count);
-}
-
 void perf_disable(void)
 {
-	__perf_disable();
-	hw_perf_disable();
+	if (!__get_cpu_var(perf_disable_count)++)
+		hw_perf_disable();
 }
 
 void perf_enable(void)
 {
-	if (__perf_enable())
+	if (!--__get_cpu_var(perf_disable_count))
 		hw_perf_enable();
 }