From b7906e034158d99126d87872cf6a3ac0d5947a6e Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 30 Apr 2013 11:11:15 +0100
Subject: [PATCH] --- yaml --- r: 367262 b: refs/heads/master c:
 c47d6a04e6ed22ccc5d89aaf2a136bf4971de310 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm64/lib/bitops.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 177cffeb2c0e..a34ae2e84916 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ae90e79051318c34d5a75c2ef5b9a55bd22f2ed
+refs/heads/master: c47d6a04e6ed22ccc5d89aaf2a136bf4971de310
diff --git a/trunk/arch/arm64/lib/bitops.S b/trunk/arch/arm64/lib/bitops.S
index fd1e801b53e7..eaed8bbd78fc 100644
--- a/trunk/arch/arm64/lib/bitops.S
+++ b/trunk/arch/arm64/lib/bitops.S
@@ -50,8 +50,8 @@ ENTRY(	\name	)
 1:	ldxr	x2, [x1]
 	lsr	x0, x2, x3		// Save old value of bit
 	\instr	x2, x2, x4		// toggle bit
-	stxr	w2, x2, [x1]
-	cbnz	w2, 1b
+	stxr	w5, x2, [x1]
+	cbnz	w5, 1b
 	smp_dmb	ish
 	and	x0, x0, #1
 3:	ret