summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/cmpxchg_64.h
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-08-18 22:40:22 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-30 00:41:40 +0400
commit00a41546e8008b9944382eed1841c785f4fc8d9c (patch)
treeb8395c1dc00ff940db9ceed76fcd426d4c80cc6c /arch/x86/include/asm/cmpxchg_64.h
parent416185bd5ac8a749ee43d1b0967b43782843d1a0 (diff)
downloadlinux-00a41546e8008b9944382eed1841c785f4fc8d9c.tar.xz
x86, cmpxchg: Move 64-bit set64_bit() to match 32-bit
Reduce arbitrary differences between 32 and 64 bits. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Link: http://lkml.kernel.org/r/4E5BCC40.3030501@goop.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/cmpxchg_64.h')
-rw-r--r--arch/x86/include/asm/cmpxchg_64.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h
index 7cf5c0a24434..5bfa560ef14e 100644
--- a/arch/x86/include/asm/cmpxchg_64.h
+++ b/arch/x86/include/asm/cmpxchg_64.h
@@ -3,11 +3,6 @@
#include <asm/alternative.h> /* Provides LOCK_PREFIX */
-static inline void set_64bit(volatile u64 *ptr, u64 val)
-{
- *ptr = val;
-}
-
extern void __xchg_wrong_size(void);
extern void __cmpxchg_wrong_size(void);
@@ -66,6 +61,11 @@ extern void __cmpxchg_wrong_size(void);
#define xchg(ptr, v) \
__xchg((v), (ptr), sizeof(*ptr))
+static inline void set_64bit(volatile u64 *ptr, u64 val)
+{
+ *ptr = val;
+}
+
#define __HAVE_ARCH_CMPXCHG 1
/*