From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - fix-m32r-__xchg.patch removed from -mm tree Date: Wed, 31 Oct 2007 15:41:14 -0700 Message-ID: <20071031224114.87FD3432BF5@localhost> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp-out.google.com ([216.239.33.17]:24481 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760219AbXJaWnJ (ORCPT ); Wed, 31 Oct 2007 18:43:09 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mathieu.desnoyers@polymtl.ca, bunk@kernel.org, takata@linux-m32r.org, mm-commits@vger.kernel.org The patch titled Fix m32r __xchg has been removed from the -mm tree. Its filename was fix-m32r-__xchg.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: Fix m32r __xchg From: Mathieu Desnoyers the #endif /* CONFIG_SMP */ should cover the default condition, or it may cause bad parameter to be silently missed. To make it work correctly, we have to remove the ifdef CONFIG SMP surrounding __xchg_called_with_bad_pointer declaration. Thanks to Adrian Bunk for detecting this. Signed-off-by: Mathieu Desnoyers Acked-by: Hirokazu Takata Cc: Adrian Bunk Signed-off-by: Andrew Morton --- include/asm-m32r/system.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN include/asm-m32r/system.h~fix-m32r-__xchg include/asm-m32r/system.h --- a/include/asm-m32r/system.h~fix-m32r-__xchg +++ a/include/asm-m32r/system.h @@ -127,9 +127,7 @@ static inline void local_irq_disable(voi ((__typeof__(*(ptr)))__xchg_local((unsigned long)(x),(ptr), \ sizeof(*(ptr)))) -#ifdef CONFIG_SMP extern void __xchg_called_with_bad_pointer(void); -#endif #ifdef CONFIG_CHIP_M32700_TS1 #define DCACHE_CLEAR(reg0, reg1, addr) \ @@ -189,9 +187,9 @@ __xchg(unsigned long x, volatile void * #endif /* CONFIG_CHIP_M32700_TS1 */ ); break; +#endif /* CONFIG_SMP */ default: __xchg_called_with_bad_pointer(); -#endif /* CONFIG_SMP */ } local_irq_restore(flags); _ Patches currently in -mm which might be from mathieu.desnoyers@polymtl.ca are local_t-documentation-update-2.patch markers-fix-warnings.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