Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944329AbXHMOpE (ORCPT ); Mon, 13 Aug 2007 10:45:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1765952AbXHMLp5 (ORCPT ); Mon, 13 Aug 2007 07:45:57 -0400 Received: from mx1.redhat.com ([66.187.233.31]:56149 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S944007AbXHMLpo (ORCPT ); Mon, 13 Aug 2007 07:45:44 -0400 Date: Mon, 13 Aug 2007 07:45:26 -0400 From: Chris Snook 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" Subject: [PATCH 23/23] make atomic_read() and atomic_set() behavior consistent on xtensa Message-ID: <20070813114526.GW24018@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> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1353 Lines: 46 From: Chris Snook Use volatile consistently in atomic.h on xtensa. Signed-off-by: Chris Snook --- linux-2.6.23-rc3-orig/include/asm-xtensa/atomic.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.23-rc3/include/asm-xtensa/atomic.h 2007-08-13 06:31:58.000000000 -0400 @@ -15,7 +15,7 @@ #include -typedef struct { volatile int counter; } atomic_t; +typedef struct { int counter; } atomic_t; #ifdef __KERNEL__ #include @@ -47,7 +47,10 @@ typedef struct { volatile int counter; } * * Atomically reads the value of @v. */ -#define atomic_read(v) ((v)->counter) +static inline int atomic_read(atomic_t *v) +{ + return *(volatile int *)&v->counter; +} /** * atomic_set - set atomic variable @@ -56,7 +59,10 @@ typedef struct { volatile int counter; } * * Atomically sets the value of @v to @i. */ -#define atomic_set(v,i) ((v)->counter = (i)) +static inline void atomic_set(atomic_t *v, int i) +{ + *(volatile int *)&v->counter = i; +} /** * atomic_add - add integer to atomic variable - 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/