[PATCH 13/24] make atomic_read() behave consistently on mips

Chris Snook
2007-08-09T14:00:58Z

From: Chris Snook <csnook@redhat.com>

Purify volatile use for atomic[64]_t on mips.

Signed-off-by: Chris Snook <csnook@redhat.com>

--- linux-2.6.23-rc2-orig/include/asm-mips/atomic.h 2007-08-08 17:48:53.000000000 -0400
+++ linux-2.6.23-rc2/include/asm-mips/atomic.h 2007-08-09 07:02:50.000000000 -0400
@@ -20,7 +20,7 @@
#include <asm/war.h>
#include <asm/system.h>

-typedef struct { volatile int counter; } atomic_t;
+typedef struct { int counter; } atomic_t;

#define ATOMIC_INIT(i) { (i) }

@@ -30,7 +30,7 @@ typedef struct { volatile int counter; }
*
* Atomically reads the value of @v.
*/
-#define atomic_read(v) ((v)->counter)
+#define atomic_read(v) (*(volatile int *)&(v)->counter)

/*
* atomic_set - set atomic variable
@@ -404,7 +404,7 @@ static __inline__ int atomic_add_unless(

#ifdef CONFIG_64BIT

-typedef struct { volatile long counter; } atomic64_t;
+typedef struct { long counter; } atomic64_t;

#define ATOMIC64_INIT(i) { (i) }

@@ -413,7 +413,7 @@ typedef struct { volatile long counter;
* @v: pointer of type atomic64_t
*
*/
-#define atomic64_read(v) ((v)->counter)
+#define atomic64_read(v) (*(volatile long *)&(v)->counter)

/*
* atomic64_set - set atomic variable