From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762229AbXHTXoN (ORCPT ); Mon, 20 Aug 2007 19:44:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754222AbXHTXn5 (ORCPT ); Mon, 20 Aug 2007 19:43:57 -0400 Received: from tomts10.bellnexxia.net ([209.226.175.54]:43899 "EHLO tomts10-srv.bellnexxia.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752612AbXHTXn4 (ORCPT ); Mon, 20 Aug 2007 19:43:56 -0400 Date: Mon, 20 Aug 2007 19:43:54 -0400 From: Mathieu Desnoyers To: Julian Calaby Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, clameter@sgi.com, sparclinux@vger.kernel.org, wli@holomorphy.com Subject: [patch 21/23] Add cmpxchg_local to sparc64 (update) Message-ID: <20070820234354.GA2269@Krystal> References: <20070820201519.512791382@polymtl.ca> <20070820201831.178200926@polymtl.ca> <646765f40708201634u5437f307l8259456c92af5cf5@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline In-Reply-To: <646765f40708201634u5437f307l8259456c92af5cf5@mail.gmail.com> X-Editor: vi X-Info: http://krystal.dyndns.org:8080 X-Operating-System: Linux/2.6.21.3-grsec (i686) X-Uptime: 19:38:12 up 21 days, 23:57, 3 users, load average: 1.23, 0.48, 0.48 User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add cmpxchg_local to sparc64 Use cmpxchg_u32 and cmpxchg_u64 for cmpxchg_local and cmpxchg64_local. For other type sizes, use the new generic cmpxchg_local (disables interrupt). Change: * Julian Calaby (julian.calaby@gmail.com) wrote: > Shouldn't #includes go at the start of the file? > Since the header depends on local_irqsave/local_irqrestore, it must be included after their declaration. Actually, being below the #include should be enough, and on sparc64 it is included at the beginning of system.h. So it makes sense to move it up for sparc64. Signed-off-by: Mathieu Desnoyers CC: clameter@sgi.com CC: sparclinux@vger.kernel.org CC: wli@holomorphy.com --- include/asm-sparc64/system.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) Index: linux-2.6-lttng/include/asm-sparc64/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-sparc64/system.h 2007-08-20 17:40:57.000000000 -0400 +++ linux-2.6-lttng/include/asm-sparc64/system.h 2007-08-20 19:42:32.000000000 -0400 @@ -9,6 +9,7 @@ #ifndef __ASSEMBLY__ #include +#include /* * Sparc (general) CPU types @@ -314,6 +315,30 @@ __cmpxchg(volatile void *ptr, unsigned l (unsigned long)_n_, sizeof(*(ptr))); \ }) +/* + * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make + * them available. + */ + +static inline unsigned long __cmpxchg_local(volatile void *ptr, + unsigned long old, + unsigned long new, int size) +{ + switch (size) { + case 4: + case 8: return __cmpxchg(ptr, old, new, size); + default: + return __cmpxchg_local_generic(ptr, old, new, size); + } + + return old; +} + +#define cmpxchg_local(ptr,o,n) \ + (__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \ + (unsigned long)(n), sizeof(*(ptr))) +#define cmpxchg64_local(ptr,o,n) cmpxchg_local((ptr), (o), (n)) + #endif /* !(__ASSEMBLY__) */ #define arch_align_stack(x) (x) -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68