summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-08-12 19:03:26 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-08-13 21:22:43 +0200
commitafa31d8eb86fc2f25083e675d57ac8173a98f999 (patch)
treeb266adc9aebcda0a7eccd7adbd07a4a5aab3ceee
parentMerge branch 'security-fixes' into fixes (diff)
downloadlinux-afa31d8eb86fc2f25083e675d57ac8173a98f999.tar.xz
linux-afa31d8eb86fc2f25083e675d57ac8173a98f999.zip
ARM: 7811/1: locks: use early clobber in arch_spin_trylock
The res variable is written before we've finished with the input operands (namely the lock address), so ensure that we mark it as `early clobber' to avoid unintended register sharing. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/include/asm/spinlock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index f8b8965666e9..7ed43f68e044 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -107,7 +107,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
" subs %1, %0, %0, ror #16\n"
" addeq %0, %0, %4\n"
" strexeq %2, %0, [%3]"
- : "=&r" (slock), "=&r" (contended), "=r" (res)
+ : "=&r" (slock), "=&r" (contended), "=&r" (res)
: "r" (&lock->slock), "I" (1 << TICKET_SHIFT)
: "cc");
} while (res);