diff options
| author |   Anton Blanchard <anton@samba.org> | 2010-05-17 14:33:53 +1000 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-17 07:57:27 -0700 |
| commit | f3d46f9d3194e0329216002a8724d4c0957abc79 (patch) | |
| tree | 6d9413e4a448d7b8d342c40297c4fbe0b9c4c2f0 /arch/sparc | |
| parent | Linus 2.6.34 (diff) | |
| download | linux-dev-f3d46f9d3194e0329216002a8724d4c0957abc79.tar.xz linux-dev-f3d46f9d3194e0329216002a8724d4c0957abc79.zip | |
atomic_t: Cast to volatile when accessing atomic variables
In preparation for removing volatile from the atomic_t definition, this
patch adds a volatile cast to all the atomic read functions.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/atomic_32.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/atomic_64.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h index f0d343c3b956..7ae128b19d3f 100644 --- a/arch/sparc/include/asm/atomic_32.h +++ b/arch/sparc/include/asm/atomic_32.h @@ -25,7 +25,7 @@ extern int atomic_cmpxchg(atomic_t *, int, int); extern int atomic_add_unless(atomic_t *, int, int); extern void atomic_set(atomic_t *, int); -#define atomic_read(v) ((v)->counter) +#define atomic_read(v) (*(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))) diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h index f2e48009989e..2050ca02c423 100644 --- a/arch/sparc/include/asm/atomic_64.h +++ b/arch/sparc/include/asm/atomic_64.h @@ -13,8 +13,8 @@ #define ATOMIC_INIT(i) { (i) } #define ATOMIC64_INIT(i) { (i) } -#define atomic_read(v) ((v)->counter) -#define atomic64_read(v) ((v)->counter) +#define atomic_read(v) (*(volatile int *)&(v)->counter) +#define atomic64_read(v) (*(volatile long *)&(v)->counter) #define atomic_set(v, i) (((v)->counter) = i) #define atomic64_set(v, i) (((v)->counter) = i) |