---

yaml --- r: 284775 b: refs/heads/master c: 74653cc h: refs/heads/master i: 284773: caeb01b 284771: d966a1b 284767: 8bd1b11 v: v3
git-mirror · Dec 7, 2011 · b141944 · b141944
1 parent 0b5cb7a
commit b141944
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: 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
@@ -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();