[PATCH 11/15] x86/cmpxchg: move 64-bit set64_bit() to match 32-bit
From: Jeremy Fitzhardinge
Date: Mon Aug 22 2011 - 19:17:52 EST
From: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
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 423ae58..aeaa610 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
/*
--
1.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/