From: Chris Snook <[EMAIL PROTECTED]> Use volatile consistently in atomic.h on sparc64.
Signed-off-by: Chris Snook <[EMAIL PROTECTED]> --- linux-2.6.23-rc3-orig/include/asm-sparc64/atomic.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.23-rc3/include/asm-sparc64/atomic.h 2007-08-13 06:17:01.000000000 -0400 @@ -11,17 +11,31 @@ #include <linux/types.h> #include <asm/system.h> -typedef struct { volatile int counter; } atomic_t; -typedef struct { volatile __s64 counter; } atomic64_t; +typedef struct { int counter; } atomic_t; +typedef struct { __s64 counter; } atomic64_t; #define ATOMIC_INIT(i) { (i) } #define ATOMIC64_INIT(i) { (i) } -#define atomic_read(v) ((v)->counter) -#define atomic64_read(v) ((v)->counter) +static __inline__ int atomic_read(atomic_t *v) +{ + return *(volatile int *)&v->counter; +} + +static __inline__ __s64 atomic64_read(atomic64_t *v) +{ + return *(volatile __s64 *)&v->counter; +} -#define atomic_set(v, i) (((v)->counter) = i) -#define atomic64_set(v, i) (((v)->counter) = i) +static __inline__ void atomic_set(atomic_t *v, int i) +{ + *(volatile int *)&v->counter = i; +} + +static __inline__ void atomic64_set(atomic64_t *v, __s64 i) +{ + *(volatile __s64 *)&v->counter = i; +} extern void atomic_add(int, atomic_t *); extern void atomic64_add(int, atomic64_t *); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/