diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 17:03:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 17:03:17 +0200 |
| commit | 0a328ea43da9c3eefce7cb6c947e43e1a0fef810 (patch) | |
| tree | f591798a923d07ef0cc8e89a595570e205f094fa /include/asm-x86/spinlock.h | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
| parent | 5bbd4c3724008c93cf3efdfc38a3402e245ab506 (diff) | |
| download | op-kernel-dev-0a328ea43da9c3eefce7cb6c947e43e1a0fef810.zip op-kernel-dev-0a328ea43da9c3eefce7cb6c947e43e1a0fef810.tar.gz | |
Merge branch 'x86/alternatives' into x86/core
Diffstat (limited to 'include/asm-x86/spinlock.h')
| -rw-r--r-- | include/asm-x86/spinlock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/spinlock.h b/include/asm-x86/spinlock.h index 5d08fa2..93adae3 100644 --- a/include/asm-x86/spinlock.h +++ b/include/asm-x86/spinlock.h @@ -97,7 +97,7 @@ static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock) "jne 1f\n\t" "movw %w0,%w1\n\t" "incb %h1\n\t" - "lock ; cmpxchgw %w1,%2\n\t" + LOCK_PREFIX "cmpxchgw %w1,%2\n\t" "1:" "sete %b1\n\t" "movzbl %b1,%0\n\t" @@ -135,7 +135,7 @@ static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock) int inc = 0x00010000; int tmp; - asm volatile("lock ; xaddl %0, %1\n" + asm volatile(LOCK_PREFIX "xaddl %0, %1\n" "movzwl %w0, %2\n\t" "shrl $16, %0\n\t" "1:\t" @@ -162,7 +162,7 @@ static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock) "cmpl %0,%1\n\t" "jne 1f\n\t" "addl $0x00010000, %1\n\t" - "lock ; cmpxchgl %1,%2\n\t" + LOCK_PREFIX "cmpxchgl %1,%2\n\t" "1:" "sete %b1\n\t" "movzbl %b1,%0\n\t" |
