Commit 2291059c authored by Pranith Kumar's avatar Pranith Kumar Committed by Ingo Molnar
Browse files

locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read() 



Use the much more reader friendly ACCESS_ONCE() instead of the cast to volatile.
This is purely a stylistic change.

Signed-off-by: default avatarPranith Kumar <bobby.prani@gmail.com>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
Acked-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Link: http://lkml.kernel.org/r/1411482607-20948-1-git-send-email-bobby.prani@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent da4c5445

arch/alpha/include/asm/atomic.h

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

#define ATOMIC64_INIT(i)	{ (i) }



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

#define atomic64_read(v)	(*(volatile long *)&(v)->counter)

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

#define atomic64_read(v)	ACCESS_ONCE((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
@@ -27,7 +27,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)	(*(volatile int *)&(v)->counter)

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

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



#if __LINUX_ARM_ARCH__ >= 6

arch/arm64/include/asm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,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)	(*(volatile int *)&(v)->counter)

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

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



/*
@@ -139,7 +139,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) 
 */

#define ATOMIC64_INIT(i) { (i) }



#define atomic64_read(v)	(*(volatile long *)&(v)->counter)

#define atomic64_read(v)	ACCESS_ONCE((v)->counter)

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



#define ATOMIC64_OP(op, asm_op)						\

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)		(*(volatile int *)&(v)->counter)

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

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



#define ATOMIC_OP_RETURN(op, asm_op, asm_con)				\

arch/cris/include/asm/atomic.h

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


#define ATOMIC_INIT(i)  { (i) }



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

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

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



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE