Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3d46f9d authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds
Browse files

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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e40152ee

arch/alpha/include/asm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#define ATOMIC_INIT(i)		( (atomic_t) { (i) } )

#define ATOMIC64_INIT(i)	( (atomic64_t) { (i) } )



#define atomic_read(v)		((v)->counter + 0)

#define atomic64_read(v)	((v)->counter + 0)

#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))

arch/arm/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 * strex/ldrex monitor on some implementations. The reason we can use it for

 * atomic_set() is the clrex or dummy strex done on every exception return.

 */

#define atomic_read(v)	((v)->counter)

#define atomic_read(v)	(*(volatile int *)&(v)->counter)

#define atomic_set(v,i)	(((v)->counter) = (i))



#if __LINUX_ARM_ARCH__ >= 6

arch/avr32/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#define ATOMIC_INIT(i)  { (i) }



#define atomic_read(v)		((v)->counter)

#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic_set(v, i)	(((v)->counter) = i)



/*

arch/cris/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#define ATOMIC_INIT(i)  { (i) }



#define atomic_read(v) ((v)->counter)

#define atomic_read(v) (*(volatile int *)&(v)->counter)

#define atomic_set(v,i) (((v)->counter) = (i))



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

arch/frv/include/asm/atomic.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define smp_mb__after_atomic_inc()	barrier()



#define ATOMIC_INIT(i)		{ (i) }

#define atomic_read(v)		((v)->counter)

#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic_set(v, i)	(((v)->counter) = (i))



#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS