Commit:     4b78fff6e736cae55dc3fb5570c7ef4037eca9b7
Parent:     aebb77aef4b50a157bf0185de31d1aede3ca2312
Author:     Mathieu Desnoyers <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 00:16:16 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 08:42:32 2008 -0800

    Add cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64
    Add the primitives cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64. 
    use cmpxchg_acq as underlying macro, just like the already existing ia64
    ia64 cmpxchg_local coding style fix
    Quoting Keith Owens:
    As a matter of coding style, I prefer
    #define cmpxchg_local   cmpxchg
    #define cmpxchg64_local cmpxchg64
    Which makes it absolutely clear that they are the same code.  With your
    patch, humans have to do a string compare of two defines to see if they
    are the same.
    Note cmpxchg is *not* a performance win vs interrupt disable / enable on 
    Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
    Acked-by: Christoph Lameter <[EMAIL PROTECTED]>
    Cc: "Luck, Tony" <[EMAIL PROTECTED]>
    Cc: Keith Owens <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 include/asm-ia64/intrinsics.h |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/asm-ia64/intrinsics.h b/include/asm-ia64/intrinsics.h
index 3a95aa4..f1135b5 100644
--- a/include/asm-ia64/intrinsics.h
+++ b/include/asm-ia64/intrinsics.h
@@ -153,11 +153,17 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);
        (__typeof__(old)) _r_;                                                  
-#define cmpxchg_acq(ptr,o,n)   ia64_cmpxchg(acq, (ptr), (o), (n), 
-#define cmpxchg_rel(ptr,o,n)   ia64_cmpxchg(rel, (ptr), (o), (n), 
+#define cmpxchg_acq(ptr, o, n) \
+       ia64_cmpxchg(acq, (ptr), (o), (n), sizeof(*(ptr)))
+#define cmpxchg_rel(ptr, o, n) \
+       ia64_cmpxchg(rel, (ptr), (o), (n), sizeof(*(ptr)))
 /* for compatibility with other platforms: */
-#define cmpxchg(ptr,o,n)       cmpxchg_acq(ptr,o,n)
+#define cmpxchg(ptr, o, n)     cmpxchg_acq((ptr), (o), (n))
+#define cmpxchg64(ptr, o, n)   cmpxchg_acq((ptr), (o), (n))
+#define cmpxchg_local          cmpxchg
+#define cmpxchg64_local                cmpxchg64
 # define CMPXCHG_BUGCHECK_DECL int _cmpxchg_bugcheck_count = 128;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to