Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S947101AbXHMPHm (ORCPT ); Mon, 13 Aug 2007 11:07:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030669AbXHMMuS (ORCPT ); Mon, 13 Aug 2007 08:50:18 -0400 Received: from mx1.redhat.com ([66.187.233.31]:50049 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030639AbXHMMuP (ORCPT ); Mon, 13 Aug 2007 08:50:15 -0400 Date: Mon, 13 Aug 2007 08:46:52 -0400 From: Chris Snook To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com, Segher Boessenkool , "Luck, Tony" , Chris Friesen , "Robert P. J. Day" Subject: Re: [PATCH 3/23] make atomic_read() and atomic_set() behavior consistent on arm Message-ID: <20070813124652.GA2805@shell.boston.redhat.com> References: <46C03885.7000109@redhat.com> <20070813110946.GC24018@shell.boston.redhat.com> <20070813121931.GA9165@flint.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070813121931.GA9165@flint.arm.linux.org.uk> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1786 Lines: 62 On Mon, Aug 13, 2007 at 01:19:31PM +0100, Russell King wrote: > On Mon, Aug 13, 2007 at 07:09:46AM -0400, Chris Snook wrote: > > By popular demand, I've redone the patchset to include volatile casts in > > atomic_set as well. I've also converted the macros to inline functions, to > > help catch type mismatches at compile time. > > and in the rest of include/asm-arm/atomic.h: > > #else /* ARM_ARCH_6 */ > > #include > > #ifdef CONFIG_SMP > #error SMP not supported on pre-ARMv6 CPUs > #endif > > #define atomic_set(v,i) (((v)->counter) = (i)) > > Seems you missed that. Grep is a wonderful tool. D'oh! Try this. -- Chris --- linux-2.6.23-rc3-orig/include/asm-arm/atomic.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.23-rc3/include/asm-arm/atomic.h 2007-08-13 08:39:52.000000000 -0400 @@ -14,13 +14,16 @@ #include #include -typedef struct { volatile int counter; } atomic_t; +typedef struct { int counter; } atomic_t; #define ATOMIC_INIT(i) { (i) } #ifdef __KERNEL__ -#define atomic_read(v) ((v)->counter) +static inline int atomic_read(atomic_t *v) +{ + return *(volatile int *)&v->counter; +} #if __LINUX_ARM_ARCH__ >= 6 @@ -122,7 +125,10 @@ static inline void atomic_clear_mask(uns #error SMP not supported on pre-ARMv6 CPUs #endif -#define atomic_set(v,i) (((v)->counter) = (i)) +static inline void atomic_set(atomic_t *v, int i) +{ + *(volatile int *)&v->counter = i; +} static inline int atomic_add_return(int i, atomic_t *v) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/