The patch titled Add cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64 has been added to the -mm tree. Its filename is add-cmpxchg_local-cmpxchg64-and-cmpxchg64_local-to-ia64.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Add cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64 From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Add the primitives cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64. They use cmpxchg_acq as underlying macro, just like the already existing ia64 cmpxchg(). Changelog: 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 IA64. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx> Acked-by: Christoph Lameter <clameter@xxxxxxx> Cc: Keith Owens <kaos@xxxxxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-ia64/intrinsics.h | 4 ++++ 1 file changed, 4 insertions(+) diff -puN include/asm-ia64/intrinsics.h~add-cmpxchg_local-cmpxchg64-and-cmpxchg64_local-to-ia64 include/asm-ia64/intrinsics.h --- a/include/asm-ia64/intrinsics.h~add-cmpxchg_local-cmpxchg64-and-cmpxchg64_local-to-ia64 +++ a/include/asm-ia64/intrinsics.h @@ -158,6 +158,10 @@ extern long ia64_cmpxchg_called_with_bad /* for compatibility with other platforms: */ #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 #ifdef CONFIG_IA64_DEBUG_CMPXCHG # define CMPXCHG_BUGCHECK_DECL int _cmpxchg_bugcheck_count = 128; _ Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are add-cmpxchg_local-to-asm-generic-for-per-cpu-atomic-operations.patch fall-back-on-interrupt-disable-in-cmpxchg8b-on-80386-and-80486.patch add-cmpxchg64-and-cmpxchg64_local-to-alpha.patch add-cmpxchg64-and-cmpxchg64_local-to-mips.patch add-cmpxchg64-and-cmpxchg64_local-to-powerpc.patch add-cmpxchg64-and-cmpxchg64_local-to-x86_64.patch add-cmpxchg_local-to-arm.patch add-cmpxchg_local-to-avr32.patch add-cmpxchg_local-to-blackfin-replace-__cmpxchg-by-generic-cmpxchg.patch add-cmpxchg_local-to-cris.patch add-cmpxchg_local-to-frv.patch add-cmpxchg_local-to-h8300.patch add-cmpxchg_local-cmpxchg64-and-cmpxchg64_local-to-ia64.patch new-cmpxchg_local-optimized-for-up-case-for-m32r.patch fix-m32r-__xchg.patch m32r-build-fix-of-arch-m32r-kernel-smpbootc.patch local_t-m32r-use-architecture-specific-cmpxchg_local.patch add-cmpxchg_local-to-m86k.patch add-cmpxchg_local-to-m68knommu.patch add-cmpxchg_local-to-parisc.patch add-cmpxchg_local-to-ppc.patch add-cmpxchg_local-to-s390.patch add-cmpxchg_local-to-sh-use-generic-cmpxchg-instead-of-cmpxchg_u32.patch add-cmpxchg_local-to-sh64.patch add-cmpxchg_local-to-sparc-move-__cmpxchg-to-systemh.patch add-cmpxchg_local-to-sparc64.patch add-cmpxchg_local-to-v850.patch add-cmpxchg_local-to-xtensa.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html