From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([66.187.233.31]:55111 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S971294AbXHMLmT (ORCPT ); Mon, 13 Aug 2007 07:42:19 -0400 Date: Mon, 13 Aug 2007 07:42:06 -0400 From: Chris Snook Subject: [PATCH 20/23] make atomic_read() and atomic_set() behavior consistent on sparc Message-ID: <20070813114206.GT24018@shell.boston.redhat.com> References: <46C03885.7000109@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <46C03885.7000109@redhat.com> Sender: linux-arch-owner@vger.kernel.org To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds Cc: akpm@linux-foundation.org, paulmck@linux.vnet.ibm.com, Segher Boessenkool , "Luck, Tony" , Chris Friesen , "Robert P. J. Day" List-ID: From: Chris Snook Use volatile consistently in atomic.h on alpha. Leave sparc-internal atomic24_t type alone. Signed-off-by: Chris Snook --- linux-2.6.23-rc3-orig/include/asm-sparc/atomic.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.23-rc3/include/asm-sparc/atomic.h 2007-08-13 06:12:49.000000000 -0400 @@ -13,7 +13,7 @@ #include -typedef struct { volatile int counter; } atomic_t; +typedef struct { int counter; } atomic_t; #ifdef __KERNEL__ @@ -61,7 +61,10 @@ extern int atomic_cmpxchg(atomic_t *, in extern int atomic_add_unless(atomic_t *, int, int); extern void atomic_set(atomic_t *, int); -#define atomic_read(v) ((v)->counter) +static inline int atomic_read(atomic_t *v) +{ + return *(volatile int *)&v->counter; +} #define atomic_add(i, v) ((void)__atomic_add_return( (int)(i), (v))) #define atomic_sub(i, v) ((void)__atomic_add_return(-(int)(i), (v)))