Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 881ccccb authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines 



The ARM arch_{read,write}_trylock implementations include unused
backwards branch labels, since we don't retry the locking operation
if the exclusive store fails.

This patch removes the labels.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 546c2896

arch/arm/include/asm/spinlock.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) 
	unsigned long tmp;

	unsigned long tmp;





	__asm__ __volatile__(

	__asm__ __volatile__(

"1:	ldrex	%0, [%1]\n"

"	ldrex	%0, [%1]\n"

"	teq	%0, #0\n"

"	teq	%0, #0\n"

"	strexeq	%0, %2, [%1]"

"	strexeq	%0, %2, [%1]"

	: "=&r" (tmp)

	: "=&r" (tmp)
@@ -268,7 +268,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) 
	unsigned long tmp, tmp2 = 1;

	unsigned long tmp, tmp2 = 1;





	__asm__ __volatile__(

	__asm__ __volatile__(

"1:	ldrex	%0, [%2]\n"

"	ldrex	%0, [%2]\n"

"	adds	%0, %0, #1\n"

"	adds	%0, %0, #1\n"

"	strexpl	%1, %0, [%2]\n"

"	strexpl	%1, %0, [%2]\n"

	: "=&r" (tmp), "+r" (tmp2)

	: "=&r" (tmp), "+r" (tmp2)