From: Jeremy Fitzhardinge Date: Thu, 18 Aug 2011 18:40:22 +0000 (-0700) Subject: x86/cmpxchg: move 64-bit set64_bit() to match 32-bit X-Git-Tag: next-20110826~15^2^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cd9cb8945afc8408e40b002d0a4074699337ceba;p=karo-tx-linux.git x86/cmpxchg: move 64-bit set64_bit() to match 32-bit Signed-off-by: Jeremy Fitzhardinge --- diff --git a/arch/x86/include/asm/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h index 423ae58aa020..aeaa6105ad2f 100644 --- a/arch/x86/include/asm/cmpxchg_64.h +++ b/arch/x86/include/asm/cmpxchg_64.h @@ -3,11 +3,6 @@ #include /* 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 /*