---

yaml --- r: 249949 b: refs/heads/master c: 57ce9bb h: refs/heads/master i: 249947: 4e01583 v: v3
git-mirror · May 20, 2011 · 22b1d43 · 22b1d43
1 parent 10dd1d4
commit 22b1d43
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git 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
@@ -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();