From b141944081678be810fee00ba02de0a1c345d0ab Mon Sep 17 00:00:00 2001
From: Deng-Cheng Zhu <dczhu@mips.com>
Date: Tue, 22 Nov 2011 03:28:46 +0800
Subject: [PATCH] --- yaml --- r: 284775 b: refs/heads/master c:
 74653ccf231a3100dd03e16e7a4178868a37332e h: refs/heads/master i:   284773:
 caeb01b957d4f6c621ab212e276f8c15853c7a31   284771:
 d966a1be7abfa0d4421464ff151fc10fc4c1f292   284767:
 8bd1b11895d5703caa470cdc53aaafb587548ea9 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/mips/kernel/perf_event_mipsxx.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 85c21f1ac5c7..c2b196f9ecf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c1b54d331bde7afbf8da24789cce2402e155495
+refs/heads/master: 74653ccf231a3100dd03e16e7a4178868a37332e
diff --git a/trunk/arch/mips/kernel/perf_event_mipsxx.c b/trunk/arch/mips/kernel/perf_event_mipsxx.c
index ab4c761cfedc..b5d6b3fa5a41 100644
--- a/trunk/arch/mips/kernel/perf_event_mipsxx.c
+++ b/trunk/arch/mips/kernel/perf_event_mipsxx.c
@@ -621,11 +621,6 @@ static int mipspmu_event_init(struct perf_event *event)
 		return -ENODEV;
 
 	if (!atomic_inc_not_zero(&active_events)) {
-		if (atomic_read(&active_events) > MIPS_MAX_HWEVENTS) {
-			atomic_dec(&active_events);
-			return -ENOSPC;
-		}
-
 		mutex_lock(&pmu_reserve_mutex);
 		if (atomic_read(&active_events) == 0)
 			err = mipspmu_get_irq();