From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762519AbXJaWvM (ORCPT ); Wed, 31 Oct 2007 18:51:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760657AbXJaWm4 (ORCPT ); Wed, 31 Oct 2007 18:42:56 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:51512 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760644AbXJaWmz (ORCPT ); Wed, 31 Oct 2007 18:42:55 -0400 Message-Id: <20071031224213.474660265@polymtl.ca> References: <20071031223710.099558229@polymtl.ca> User-Agent: quilt/0.46-1 Date: Wed, 31 Oct 2007 18:37:20 -0400 From: Mathieu Desnoyers To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , clameter@sgi.com, starvik@axis.com Subject: [patch 10/28] Add cmpxchg_local to cris Content-Disposition: inline; filename=add-cmpxchg-local-to-cris.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Wed, 31 Oct 2007 22:42:13 +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 CC: starvik@axis.com --- include/asm-cris/system.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: linux-2.6-lttng/include/asm-cris/system.h =================================================================== --- linux-2.6-lttng.orig/include/asm-cris/system.h 2007-10-31 17:32:44.000000000 -0400 +++ linux-2.6-lttng/include/asm-cris/system.h 2007-10-31 18:04:20.000000000 -0400 @@ -66,6 +66,21 @@ static inline unsigned long __xchg(unsig 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 + #define arch_align_stack(x) (x) void default_idle(void); -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68