From 107af3ebcef5ed3fcdcf3a849176d13d84bf3d83 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Thu, 5 Apr 2012 18:24:42 +0200
Subject: [PATCH] --- yaml --- r: 304830 b: refs/heads/master c:
 5f09fc688936705b2020ca247df39ee27283668a h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/x86/kernel/cpu/perf_event_amd.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5878e381f7e8..9d591aa6da3f 100644
--- 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
index 95e7fe1c5f0b..589286f28877 100644
--- 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;
-		}
 	}
 }