[PATCH 6/23] make atomic_read() and atomic_set() behavior consistent on cris

From: Chris Snook
Date: Mon Aug 13 2007 - 10:13:19 EST


From: Chris Snook <csnook@xxxxxxxxxx>

Use volatile consistently in atomic.h on cris.

Signed-off-by: Chris Snook <csnook@xxxxxxxxxx>

--- linux-2.6.23-rc3-orig/include/asm-cris/atomic.h 2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.23-rc3/include/asm-cris/atomic.h 2007-08-13 05:23:37.000000000 -0400
@@ -11,12 +11,19 @@
* resource counting etc..
*/

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

#define ATOMIC_INIT(i) { (i) }

-#define atomic_read(v) ((v)->counter)
-#define atomic_set(v,i) (((v)->counter) = (i))
+static inline int atomic_read(atomic_t *v)
+{
+ return *(volatile int *)&v->counter;
+}
+
+static inline void atomic_set(atomic_t *v, int i)
+{
+ *(volatile int *)&v->counter = i;
+}

/* These should be written in asm but we do it in C for now. */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/