atomic_read: Use ACCESS_ONCE() instead of cast to volatile
Subsystems (12)
PATCH 1/1 atomic_read: Use ACCESS_ONCE() instead of cast to volatile
Use the much reader friendly ACCESS_ONCE() instead of the cast to volatile. This is purely a style change.
--- arch/alpha/include/asm/atomic.h | 4 ++-- arch/arm/include/asm/atomic.h | 2 +- arch/arm64/include/asm/atomic.h | 4 ++-- arch/avr32/include/asm/atomic.h | 2 +- arch/cris/include/asm/atomic.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/ia64/include/asm/atomic.h | 4 ++-- arch/m32r/include/asm/atomic.h | 2 +- arch/m68k/include/asm/atomic.h | 2 +- arch/mips/include/asm/atomic.h | 4 ++-- arch/parisc/include/asm/atomic.h | 4 ++-- arch/sh/include/asm/atomic.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 4 ++-- arch/x86/include/asm/atomic.h | 2 +- arch/x86/include/asm/atomic64_64.h | 2 +- arch/xtensa/include/asm/atomic.h | 2 +- include/asm-generic/atomic.h | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-)
arch/alpha/include/asm/atomic.h +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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. */
arch/frv/include/asm/atomic.h +1 -1
@@ -31,7 +31,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))#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
arch/ia64/include/asm/atomic.h +2 -2
@@ -21,8 +21,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/m32r/include/asm/atomic.h +1 -1
@@ -28,7 +28,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/** * atomic_set - set atomic variable
arch/m68k/include/asm/atomic.h +1 -1
@@ -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)/*
arch/mips/include/asm/atomic.h +2 -2
@@ -29,7 +29,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/* * atomic_set - set atomic variable
@@ -306,7 +306,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)* @v: pointer of type atomic64_t * */ -#define atomic64_read (v) (*(volatile long *)&(v)->counter) +#define atomic64_read (v) ACCESS_ONCE((v)->counter)/* * atomic64_set - set atomic variable
arch/parisc/include/asm/atomic.h +2 -2
@@ -67,7 +67,7 @@ static __inline__ void atomic_set(atomic_t *v, int i)static __inline__int atomic_read (const atomic_t *v) { -return (*(volatile int *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/* exported interface */
@@ -204,7 +204,7 @@ atomic64_set(atomic64_t *v, s64 i)static __inline__s64 atomic64_read (const atomic64_t *v) { -return (*(volatile long *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }#define atomic64_inc (v) (atomic64_add( 1,(v)))
arch/sh/include/asm/atomic.h +1 -1
@@ -14,7 +14,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))#if defined(CONFIG_GUSA_RB )
arch/sparc/include/asm/atomic_32.h +1 -1
@@ -26,7 +26,7 @@ int atomic_cmpxchg(atomic_t *, int, int);int __atomic_add_unless (atomic_t *,int ,int );void atomic_set (atomic_t *,int ); -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((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)))
arch/sparc/include/asm/atomic_64.h +2 -2
@@ -14,8 +14,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/x86/include/asm/atomic.h +1 -1
@@ -24,7 +24,7 @@*/ static inline int atomic_read (const atomic_t *v) { -return (*(volatile int *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/**
arch/x86/include/asm/atomic64_64.h +1 -1
@@ -18,7 +18,7 @@*/ static inline long atomic64_read (const atomic64_t *v) { -return (*(volatile long *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/**
arch/xtensa/include/asm/atomic.h +1 -1
@@ -47,7 +47,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/** * atomic_set - set atomic variable
include/asm-generic/atomic.h +1 -1
@@ -126,7 +126,7 @@ ATOMIC_OP(or, |)* Atomically reads the value of @v. */ #ifndef atomic_read -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)#endif /**
Signature · 1 line
2.1.0
Peter Zijlstra
maintainerQuoted 4 lines · Pranith Kumar
Use the much reader friendly
ACCESS_ONCE()instead of the cast to volatile. This is purely a style change.Signed-off-by Pranith Kumar <[email protected]>
Looks good to me; I can route it through the locking tree if there's no objections.
Quoted 10 lines · Pranith Kumar
Use the much reader friendly
ACCESS_ONCE()instead of the cast to volatile. This is purely a style change.Signed-off-by Pranith Kumar <[email protected]>--- arch/alpha/include/asm/atomic.h | 4 ++-- arch/arm/include/asm/atomic.h | 2 +- arch/arm64/include/asm/atomic.h | 4 ++-- arch/avr32/include/asm/atomic.h | 2 +- arch/cris/include/asm/atomic.h | 2 +-
For the CRIS parts:
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
Quoted 9 lines · Pranith Kumar
Use the much reader friendly
ACCESS_ONCE()instead of the cast to volatile. This is purely a style change.Signed-off-by Pranith Kumar <[email protected]>--- arch/alpha/include/asm/atomic.h | 4 ++-- arch/arm/include/asm/atomic.h | 2 +- arch/arm64/include/asm/atomic.h | 4 ++-- arch/avr32/include/asm/atomic.h | 2 +-
For the AVR32 related part.
Quoted 7 lines
arch/cris/include/asm/atomic.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/ia64/include/asm/atomic.h | 4 ++-- arch/m32r/include/asm/atomic.h | 2 +- arch/m68k/include/asm/atomic.h | 2 +- arch/mips/include/asm/atomic.h | 4 ++-- arch/parisc/include/asm/atomic.h | 4 ++--
Quoted 8 lines
arch/sh/include/asm/atomic.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 4 ++-- arch/x86/include/asm/atomic.h | 2 +- arch/x86/include/asm/atomic64_64.h | 2 +- arch/xtensa/include/asm/atomic.h | 2 +- include/asm-generic/atomic.h | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-)
<snipp diff>
Signature · 1 line
BR, HcE
Quoted 16 lines · Pranith Kumar
Use the much reader friendly
ACCESS_ONCE()instead of the cast to volatile. This is purely a style change.Signed-off-by Pranith Kumar <[email protected]>--- arch/alpha/include/asm/atomic.h | 4 ++-- arch/arm/include/asm/atomic.h | 2 +- arch/arm64/include/asm/atomic.h | 4 ++-- arch/avr32/include/asm/atomic.h | 2 +- arch/cris/include/asm/atomic.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/ia64/include/asm/atomic.h | 4 ++-- arch/m32r/include/asm/atomic.h | 2 +- arch/m68k/include/asm/atomic.h | 2 +- arch/mips/include/asm/atomic.h | 4 ++-- arch/parisc/include/asm/atomic.h | 4 ++--
Quoted 8 lines
arch/sh/include/asm/atomic.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 4 ++-- arch/x86/include/asm/atomic.h | 2 +- arch/x86/include/asm/atomic64_64.h | 2 +- arch/xtensa/include/asm/atomic.h | 2 +- include/asm-generic/atomic.h | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-)
For xtensa:
Signature · 2 lines
Thanks. -- Max
tip-bot for Pranith Kumar
merge bot[tip:locking/arch] locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()
In reply to Pranith Kumarlocking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()
Commit-ID: 2291059c852706c6f5ffb400366042b7625066cd Gitweb: http://git.kernel.org/tip/2291059c852706c6f5ffb400366042b7625066cd Author: Pranith Kumar <[email protected]> AuthorDate: Tue, 23 Sep 2014 10:29:50 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 3 Oct 2014 06:06:23 +0200
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.
--- arch/alpha/include/asm/atomic.h | 4 ++-- arch/arm/include/asm/atomic.h | 2 +- arch/arm64/include/asm/atomic.h | 4 ++-- arch/avr32/include/asm/atomic.h | 2 +- arch/cris/include/asm/atomic.h | 2 +- arch/frv/include/asm/atomic.h | 2 +- arch/ia64/include/asm/atomic.h | 4 ++-- arch/m32r/include/asm/atomic.h | 2 +- arch/m68k/include/asm/atomic.h | 2 +- arch/mips/include/asm/atomic.h | 4 ++-- arch/parisc/include/asm/atomic.h | 4 ++-- arch/sh/include/asm/atomic.h | 2 +- arch/sparc/include/asm/atomic_32.h | 2 +- arch/sparc/include/asm/atomic_64.h | 4 ++-- arch/x86/include/asm/atomic.h | 2 +- arch/x86/include/asm/atomic64_64.h | 2 +- arch/xtensa/include/asm/atomic.h | 2 +- include/asm-generic/atomic.h | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-)
arch/alpha/include/asm/atomic.h +2 -2
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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. */
arch/frv/include/asm/atomic.h +1 -1
@@ -31,7 +31,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))#ifndef CONFIG_FRV_OUTOFLINE_ATOMIC_OPS
arch/ia64/include/asm/atomic.h +2 -2
@@ -21,8 +21,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/m32r/include/asm/atomic.h +1 -1
@@ -28,7 +28,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/** * atomic_set - set atomic variable
arch/m68k/include/asm/atomic.h +1 -1
@@ -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)/*
arch/mips/include/asm/atomic.h +2 -2
@@ -29,7 +29,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/* * atomic_set - set atomic variable
@@ -306,7 +306,7 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)* @v: pointer of type atomic64_t * */ -#define atomic64_read (v) (*(volatile long *)&(v)->counter) +#define atomic64_read (v) ACCESS_ONCE((v)->counter)/* * atomic64_set - set atomic variable
arch/parisc/include/asm/atomic.h +2 -2
@@ -67,7 +67,7 @@ static __inline__ void atomic_set(atomic_t *v, int i)static __inline__int atomic_read (const atomic_t *v) { -return (*(volatile int *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/* exported interface */
@@ -204,7 +204,7 @@ atomic64_set(atomic64_t *v, s64 i)static __inline__s64 atomic64_read (const atomic64_t *v) { -return (*(volatile long *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }#define atomic64_inc (v) (atomic64_add( 1,(v)))
arch/sh/include/asm/atomic.h +1 -1
@@ -14,7 +14,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))#if defined(CONFIG_GUSA_RB )
arch/sparc/include/asm/atomic_32.h +1 -1
@@ -26,7 +26,7 @@ int atomic_cmpxchg(atomic_t *, int, int);int __atomic_add_unless (atomic_t *,int ,int );void atomic_set (atomic_t *,int ); -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((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)))
arch/sparc/include/asm/atomic_64.h +2 -2
@@ -14,8 +14,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/x86/include/asm/atomic.h +1 -1
@@ -24,7 +24,7 @@*/ static inline int atomic_read (const atomic_t *v) { -return (*(volatile int *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/**
arch/x86/include/asm/atomic64_64.h +1 -1
@@ -18,7 +18,7 @@*/ static inline long atomic64_read (const atomic64_t *v) { -return (*(volatile long *)&(v)->counter); +return ACCESS_ONCE ((v)->counter); }/**
arch/xtensa/include/asm/atomic.h +1 -1
@@ -47,7 +47,7 @@* * Atomically reads the value of @v. */ -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)/** * atomic_set - set atomic variable
include/asm-generic/atomic.h +1 -1
@@ -126,7 +126,7 @@ ATOMIC_OP(or, |)* Atomically reads the value of @v. */ #ifndef atomic_read -#define atomic_read (v) (*(volatile int *)&(v)->counter) +#define atomic_read (v) ACCESS_ONCE((v)->counter)#endif /**