From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca ([132.207.4.11]:51140 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754154AbXJ3ToM (ORCPT ); Tue, 30 Oct 2007 15:44:12 -0400 Message-Id: <20071030192109.356783587@polymtl.ca> References: <20071030191557.947156623@polymtl.ca> Date: Tue, 30 Oct 2007 15:16:21 -0400 From: Mathieu Desnoyers Subject: [patch 24/28] Add cmpxchg_local to sh64 Content-Disposition: inline; filename=add-cmpxchg-local-to-sh64.patch Sender: linux-arch-owner@vger.kernel.org To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, matthew@wil.cx, linux-arch@vger.kernel.org, penberg@cs.helsinki.fi, linux-mm@kvack.org, Christoph Lameter Cc: Mathieu Desnoyers , lethal@linux-sh.org List-ID: 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 CC: lethal@linux-sh.org --- include/asm-sh64/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: linux-2.6-lttng/include/asm-sh64/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-sh64/system.h 2007-07-23 11:01:16.000000000 -0400 +++ linux-2.6-lttng/include/asm-sh64/system.h 2007-07-23 11:01:20.000000000 -0400 @@ -164,6 +164,21 @@ static __inline__ unsigned long __xchg(u return x; } +#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 + /* XXX * disable hlt during certain critical i/o operations */ -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68