From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763304AbXHTUY1 (ORCPT ); Mon, 20 Aug 2007 16:24:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762122AbXHTUTW (ORCPT ); Mon, 20 Aug 2007 16:19:22 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:53810 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762386AbXHTUTS (ORCPT ); Mon, 20 Aug 2007 16:19:18 -0400 Message-Id: <20070820201831.618314545@polymtl.ca> References: <20070820201519.512791382@polymtl.ca> User-Agent: quilt/0.46-1 Date: Mon, 20 Aug 2007 16:15:41 -0400 From: Mathieu Desnoyers To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , clameter@sgi.com Subject: [patch 22/23] Add cmpxchg_local to v850 Content-Disposition: inline; filename=add-cmpxchg-local-to-v850.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Mon, 20 Aug 2007 20:18:32 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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: clameter@sgi.com --- include/asm-v850/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: linux-2.6-lttng/include/asm-v850/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-v850/system.h 2007-07-23 11:28:45.000000000 -0400 +++ linux-2.6-lttng/include/asm-v850/system.h 2007-07-23 11:28:57.000000000 -0400 @@ -104,6 +104,21 @@ static inline unsigned long __xchg (unsi return tmp; } +#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 + #define arch_align_stack(x) (x) #endif /* __V850_SYSTEM_H__ */ -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68