[PATCH] x86: use LOCK_PREFIX consistently in tick spin lock code

Jan Beulich
2008-08-29T11:55:53Z

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Nick Piggin <npiggin@suse.de>

---
include/asm-x86/spinlock.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

--- linux-2.6.27-rc5/include/asm-x86/spinlock.h 2008-08-21 14:37:34.000000000 +0200
+++ 2.6.27-rc5-x86-spinlock-prefix/include/asm-x86/spinlock.h 2008-08-19 12:43:22.000000000 +0200
@@ -97,8 +97,8 @@ static __always_inline int __ticket_spin
"jne 1f\n\t"
"movw %w0,%w1\n\t"
"incb %h1\n\t"
- "lock ; cmpxchgw %w1,%2\n\t"
- "1:"
+ LOCK_PREFIX "cmpxchgw %w1, %2\n"
+ "1:\t"
"sete %b1\n\t"
"movzbl %b1,%0\n\t"
: "=&a" (tmp), "=Q" (new), "+m" (lock->slock)
@@ -135,9 +135,9 @@ static __always_inline void __ticket_spi
int inc = 0x00010000;
int tmp;

- asm volatile("lock ; xaddl %0, %1\n"
+ asm volatile(LOCK_PREFIX "xaddl %0, %1\n\t"
"movzwl %w0, %2\n\t"
- "shrl $16, %0\n\t"
+ "shrl $16, %0\n"
"1:\t"
"cmpl %0, %2\n\t"
"je 2f\n\t"
@@ -162,8 +162,8 @@ static __always_inline int __ticket_spin
"cmpl %0,%1\n\t"
"jne 1f\n\t"
"addl $0x00010000, %1\n\t"
- "lock ; cmpxchgl %1,%2\n\t"
- "1:"
+ LOCK_PREFIX "cmpxchgl %1, %2\n"
+ "1:\t"
"sete %b1\n\t"
"movzbl %b1,%0\n\t"
: "=&a" (tmp), "=r" (new), "+m" (lock->slock)