---

yaml --- r: 351134 b: refs/heads/master c: 20e260b h: refs/heads/master v: v3
git-mirror · Jan 28, 2013 · 9424e18 · 9424e18
1 parent f11e166
commit 9424e18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git 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
@@ -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();
 }