From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - add-cmpxchg_local-to-arm.patch removed from -mm tree Date: Wed, 31 Oct 2007 15:40:58 -0700 Message-ID: <20071031224058.50664432BF5@localhost> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp-out.google.com ([216.239.45.13]:61548 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760366AbXJaWmm (ORCPT ); Wed, 31 Oct 2007 18:42:42 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mathieu.desnoyers@polymtl.ca, clameter@sgi.com, rmk@arm.linux.org.uk, mm-commits@vger.kernel.org The patch titled Add cmpxchg_local to arm has been removed from the -mm tree. Its filename was add-cmpxchg_local-to-arm.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: Add cmpxchg_local to arm 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: Christoph Lameter Cc: Russell King Signed-off-by: Andrew Morton --- include/asm-arm/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff -puN include/asm-arm/system.h~add-cmpxchg_local-to-arm include/asm-arm/system.h --- a/include/asm-arm/system.h~add-cmpxchg_local-to-arm +++ a/include/asm-arm/system.h @@ -350,6 +350,21 @@ static inline unsigned long __xchg(unsig extern void disable_hlt(void); extern void enable_hlt(void); +#include + +/* + * 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))) +#define cmpxchg64_local(ptr,o,n) __cmpxchg64_local_generic((ptr), (o), (n)) + +#ifndef CONFIG_SMP +#include +#endif + #endif /* __ASSEMBLY__ */ #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-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