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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Will Deacon and committed by

Russell King 13 years ago 881ccccb 546c2896

+2 -2

1 changed file

expand all

arch

arm

include

asm

spinlock.h

+2 -2

arch/arm/include/asm/spinlock.h

··· 182 182 unsigned long tmp; 183 183 184 184 __asm__ __volatile__( 185 - "1: ldrex %0, [%1]\n" 185 + " ldrex %0, [%1]\n" 186 186 " teq %0, #0\n" 187 187 " strexeq %0, %2, [%1]" 188 188 : "=&r" (tmp) ··· 268 268 unsigned long tmp, tmp2 = 1; 269 269 270 270 __asm__ __volatile__( 271 - "1: ldrex %0, [%2]\n" 271 + " ldrex %0, [%2]\n" 272 272 " adds %0, %0, #1\n" 273 273 " strexpl %1, %0, [%2]\n" 274 274 : "=&r" (tmp), "+r" (tmp2)