diff options
author | Jan Beulich <jbeulich@novell.com> | 2005-09-12 18:49:24 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 19:50:57 +0200 |
commit | a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5 (patch) | |
tree | 233b4d6dc1b4ae39eb3c4c5db3591503cf90768d /include/asm-x86_64/system.h | |
parent | [PATCH] x86-64: Declare NMI_VECTOR and handle it in the IPI sending code. (diff) | |
download | linux-a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5.tar.xz linux-a2d236b3ac8fcbbf1bae7d815294d258ba24e3f5.zip |
[PATCH] x86-64: Lose constraints on cmpxchg
While only cosmetic for x86-64, this adjusts the cmpxchg code appearantly
inherited from i386 to use more generic constraints.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64/system.h')
-rw-r--r-- | include/asm-x86_64/system.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h index d65381194bda..85348e02ad2e 100644 --- a/include/asm-x86_64/system.h +++ b/include/asm-x86_64/system.h @@ -253,19 +253,19 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, case 2: __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2" : "=a"(prev) - : "q"(new), "m"(*__xg(ptr)), "0"(old) + : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); return prev; case 4: __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %k1,%2" : "=a"(prev) - : "q"(new), "m"(*__xg(ptr)), "0"(old) + : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); return prev; case 8: __asm__ __volatile__(LOCK_PREFIX "cmpxchgq %1,%2" : "=a"(prev) - : "q"(new), "m"(*__xg(ptr)), "0"(old) + : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); return prev; } |