---

yaml --- r: 304830 b: refs/heads/master c: 5f09fc6 h: refs/heads/master v: v3
git-mirror · Apr 26, 2012 · 107af3e · 107af3e
1 parent 5363cdb
commit 107af3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10c250234c98928d1e15c4cea1c44b9a25354ccf
+refs/heads/master: 5f09fc688936705b2020ca247df39ee27283668a
diff --git a/trunk/arch/x86/kernel/cpu/perf_event_amd.c b/trunk/arch/x86/kernel/cpu/perf_event_amd.c
@@ -205,10 +205,8 @@ static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
 	 * when we come here
 	 */
 	for (i = 0; i < x86_pmu.num_counters; i++) {
-		if (nb->owners[i] == event) {
-			cmpxchg(nb->owners+i, event, NULL);
+		if (cmpxchg(nb->owners + i, event, NULL) == event)
 			break;
-		}
 	}
 }