---

yaml --- r: 367263 b: refs/heads/master c: 16c85a1 h: refs/heads/master i: 367261: 30eeca1 367259: 92b5a3d 367255: de491dd 367247: d16c0e8 367231: 1ead25a v: v3
git-mirror · Apr 30, 2013 · f5af304 · f5af304
1 parent b7906e0
commit f5af304
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c47d6a04e6ed22ccc5d89aaf2a136bf4971de310
+refs/heads/master: 16c85a1fd73eade2ae290d759924c09b4595f504
diff --git a/trunk/arch/arm64/lib/bitops.S b/trunk/arch/arm64/lib/bitops.S
@@ -46,13 +46,11 @@ ENTRY(	\name	)
 	mov	x2, #1
 	add	x1, x1, x0, lsr #3	// Get word offset
 	lsl	x4, x2, x3		// Create mask
-	smp_dmb	ish
-1:	ldxr	x2, [x1]
+1:	ldaxr	x2, [x1]
 	lsr	x0, x2, x3		// Save old value of bit
 	\instr	x2, x2, x4		// toggle bit
-	stxr	w5, x2, [x1]
+	stlxr	w5, x2, [x1]
 	cbnz	w5, 1b
-	smp_dmb	ish
 	and	x0, x0, #1
 3:	ret
 ENDPROC(\name	)