[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-00a41546e8008b9944382eed1841c785f4fc8d9c@git.kernel.org>
Date: Tue, 30 Aug 2011 05:23:24 GMT
From: tip-bot for Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
tglx@...utronix.de, hpa@...ux.intel.com,
jeremy.fitzhardinge@...rix.com
Subject: [tip:x86/spinlocks] x86, cmpxchg: Move 64-bit set64_bit() to match 32-bit
Commit-ID: 00a41546e8008b9944382eed1841c785f4fc8d9c
Gitweb: http://git.kernel.org/tip/00a41546e8008b9944382eed1841c785f4fc8d9c
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
AuthorDate: Thu, 18 Aug 2011 11:40:22 -0700
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Mon, 29 Aug 2011 13:41:40 -0700
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@...rix.com>
Link: http://lkml.kernel.org/r/4E5BCC40.3030501@goop.org
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
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 7cf5c0a..5bfa560 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
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists