From 22b1d437b9a3573d33a14fc03953ae46ceece044 Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 17 May 2011 09:15:38 +0100
Subject: [PATCH] --- yaml --- r: 249949 b: refs/heads/master c:
 57ce9bb39b476accf8fba6e16aea67ed76ea523d h: refs/heads/master i:   249947:
 4e01583e9fb84bab563dbc3b80cdfbe24fad8f6f v: v3

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

diff --git a/[refs] b/[refs]
index d4b5743bac89..6566204ea9fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31bee4cf0e74e9c962d481a68452debaf45ed4ac
+refs/heads/master: 57ce9bb39b476accf8fba6e16aea67ed76ea523d
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index 139e3c827369..d53c0abc4dd3 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -560,11 +560,6 @@ static int armpmu_event_init(struct perf_event *event)
 	event->destroy = hw_perf_event_destroy;
 
 	if (!atomic_inc_not_zero(&active_events)) {
-		if (atomic_read(&active_events) > armpmu->num_events) {
-			atomic_dec(&active_events);
-			return -ENOSPC;
-		}
-
 		mutex_lock(&pmu_reserve_mutex);
 		if (atomic_read(&active_events) == 0) {
 			err = armpmu_reserve_hardware();