From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - add-cmpxchg_local-to-m86k.patch removed from -mm tree Date: Wed, 31 Oct 2007 15:41:20 -0700 Message-ID: <20071031224120.5A9B5432BF7@localhost> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp-out.google.com ([216.239.33.17]:24446 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760687AbXJaWnE (ORCPT ); Wed, 31 Oct 2007 18:43:04 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mathieu.desnoyers@polymtl.ca, geert@linux-m68k.org, zippel@linux-m68k.org, mm-commits@vger.kernel.org The patch titled Add cmpxchg_local to m86k has been removed from the -mm tree. Its filename was add-cmpxchg_local-to-m86k.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: Add cmpxchg_local to m86k From: Mathieu Desnoyers Use the new generic cmpxchg_local (disables interrupt). Also use the generic cmpxchg as fallback if SMP is not set. Signed-off-by: Mathieu Desnoyers Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton --- include/asm-m68k/system.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff -puN include/asm-m68k/system.h~add-cmpxchg_local-to-m86k include/asm-m68k/system.h --- a/include/asm-m68k/system.h~add-cmpxchg_local-to-m86k +++ a/include/asm-m68k/system.h @@ -154,6 +154,10 @@ static inline unsigned long __xchg(unsig } #endif +#include + +#define cmpxchg64_local(ptr,o,n) __cmpxchg64_local_generic((ptr), (o), (n)) + /* * Atomic compare and exchange. Compare OLD with MEM, if identical, * store NEW in MEM. Return the initial value in MEM. Success is @@ -188,6 +192,23 @@ static inline unsigned long __cmpxchg(vo #define cmpxchg(ptr,o,n)\ ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ (unsigned long)(n),sizeof(*(ptr)))) +#define cmpxchg_local(ptr,o,n)\ + ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),\ + (unsigned long)(n),sizeof(*(ptr)))) +#else + +/* + * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make + * them available. + */ +#define cmpxchg_local(ptr,o,n) \ + (__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o), \ + (unsigned long)(n), sizeof(*(ptr))) + +#ifndef CONFIG_SMP +#include +#endif + #endif #define arch_align_stack(x) (x) _ Patches currently in -mm which might be from mathieu.desnoyers@polymtl.ca are local_t-documentation-update-2.patch markers-fix-warnings.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