diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2011-08-18 14:40:22 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-29 16:41:40 -0400 |
commit | 00a41546e8008b9944382eed1841c785f4fc8d9c (patch) | |
tree | b8395c1dc00ff940db9ceed76fcd426d4c80cc6c | |
parent | 416185bd5ac8a749ee43d1b0967b43782843d1a0 (diff) |
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>
-rw-r--r-- | arch/x86/include/asm/cmpxchg_64.h | 10 |
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 @@ | |||
3 | 3 | ||
4 | #include <asm/alternative.h> /* Provides LOCK_PREFIX */ | 4 | #include <asm/alternative.h> /* Provides LOCK_PREFIX */ |
5 | 5 | ||
6 | static inline void set_64bit(volatile u64 *ptr, u64 val) | ||
7 | { | ||
8 | *ptr = val; | ||
9 | } | ||
10 | |||
11 | extern void __xchg_wrong_size(void); | 6 | extern void __xchg_wrong_size(void); |
12 | extern void __cmpxchg_wrong_size(void); | 7 | extern void __cmpxchg_wrong_size(void); |
13 | 8 | ||
@@ -66,6 +61,11 @@ extern void __cmpxchg_wrong_size(void); | |||
66 | #define xchg(ptr, v) \ | 61 | #define xchg(ptr, v) \ |
67 | __xchg((v), (ptr), sizeof(*ptr)) | 62 | __xchg((v), (ptr), sizeof(*ptr)) |
68 | 63 | ||
64 | static inline void set_64bit(volatile u64 *ptr, u64 val) | ||
65 | { | ||
66 | *ptr = val; | ||
67 | } | ||
68 | |||
69 | #define __HAVE_ARCH_CMPXCHG 1 | 69 | #define __HAVE_ARCH_CMPXCHG 1 |
70 | 70 | ||
71 | /* | 71 | /* |