summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-08-18 11:34:46 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-08-29 13:41:17 -0700
commit416185bd5ac8a749ee43d1b0967b43782843d1a0 (patch)
treebdc4f0c293c77c4f7662922220fd56d976d2acf8 /arch
parent4009338d62e9d1c21b230bd7ebab6c43c482430e (diff)
downloadblackbird-op-linux-416185bd5ac8a749ee43d1b0967b43782843d1a0.tar.gz
blackbird-op-linux-416185bd5ac8a749ee43d1b0967b43782843d1a0.zip
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')
-rw-r--r--arch/x86/include/asm/cmpxchg_32.h3
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 024b694517ce..59d8e36d1eed 100644
--- a/arch/x86/include/asm/cmpxchg_32.h
+++ b/arch/x86/include/asm/cmpxchg_32.h
@@ -9,6 +9,7 @@
*/
extern void __xchg_wrong_size(void);
+extern void __cmpxchg_wrong_size(void);
/*
* 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)
: "memory");
}
-extern void __cmpxchg_wrong_size(void);
-
/*
* Atomic compare and exchange. Compare OLD with MEM, if identical,
* store NEW in MEM. Return the initial value in MEM. Success is
OpenPOWER on IntegriCloud