diff options
author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2011-08-18 14:34:46 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-08-29 16:41:17 -0400 |
commit | 416185bd5ac8a749ee43d1b0967b43782843d1a0 (patch) | |
tree | bdc4f0c293c77c4f7662922220fd56d976d2acf8 /arch/x86 | |
parent | 4009338d62e9d1c21b230bd7ebab6c43c482430e (diff) |
x86, cmpxchg: Move 32-bit __cmpxchg_wrong_size to match 64 bit.
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')
-rw-r--r-- | arch/x86/include/asm/cmpxchg_32.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/include/asm/cmpxchg_32.h b/arch/x86/include/asm/cmpxchg_32.h index 024b694517c..59d8e36d1ee 100644 --- a/arch/x86/include/asm/cmpxchg_32.h +++ b/arch/x86/include/asm/cmpxchg_32.h | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | extern void __xchg_wrong_size(void); | 11 | extern void __xchg_wrong_size(void); |
12 | extern void __cmpxchg_wrong_size(void); | ||
12 | 13 | ||
13 | /* | 14 | /* |
14 | * Note: no "lock" prefix even on SMP: xchg always implies lock anyway. | 15 | * Note: no "lock" prefix even on SMP: xchg always implies lock anyway. |
@@ -84,8 +85,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 value) | |||
84 | : "memory"); | 85 | : "memory"); |
85 | } | 86 | } |
86 | 87 | ||
87 | extern void __cmpxchg_wrong_size(void); | ||
88 | |||
89 | /* | 88 | /* |
90 | * Atomic compare and exchange. Compare OLD with MEM, if identical, | 89 | * Atomic compare and exchange. Compare OLD with MEM, if identical, |
91 | * store NEW in MEM. Return the initial value in MEM. Success is | 90 | * store NEW in MEM. Return the initial value in MEM. Success is |