From 9424e188d8600810edc66e1164c39e2686eddc10 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Thu, 24 Jan 2013 14:47:38 +0100
Subject: [PATCH] --- yaml --- r: 351134 b: refs/heads/master c:
 20e260b6f4f717c100620122f626a2c06a4cfd72 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/include/asm/spinlock.h | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index e550f5e57a52..9c35005689bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a301110b7bd33ef10164c184fe2c1d8c4c3ab6b
+refs/heads/master: 20e260b6f4f717c100620122f626a2c06a4cfd72
diff --git a/trunk/arch/arm/include/asm/spinlock.h b/trunk/arch/arm/include/asm/spinlock.h
index b4ca707d0a69..6220e9fdf4c7 100644
--- a/trunk/arch/arm/include/asm/spinlock.h
+++ b/trunk/arch/arm/include/asm/spinlock.h
@@ -119,22 +119,8 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
 
 static inline void arch_spin_unlock(arch_spinlock_t *lock)
 {
-	unsigned long tmp;
-	u32 slock;
-
 	smp_mb();
-
-	__asm__ __volatile__(
-"	mov	%1, #1\n"
-"1:	ldrex	%0, [%2]\n"
-"	uadd16	%0, %0, %1\n"
-"	strex	%1, %0, [%2]\n"
-"	teq	%1, #0\n"
-"	bne	1b"
-	: "=&r" (slock), "=&r" (tmp)
-	: "r" (&lock->slock)
-	: "cc");
-
+	lock->tickets.owner++;
 	dsb_sev();
 }