arm64: cmpxchg: update macros to prevent warnings
PATCH 1/1 arm64: cmpxchg: update macros to prevent warnings
From: Mark Hambleton <[email protected]>
Make sure the value we are going to return is referenced in order to avoid warnings from newer GCCs such as:
arch/arm64/include/asm/cmpxchg.h:162:3: warning: value computed is not used [-Wunused-value]
((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \
^net/netfilter/nf_conntrack_core.c:674:2: note: in expansion of macro ?cmpxchg?
cmpxchg(&nf_conntrack_hash_rnd, 0, rand);
[Modified to use the current underlying implementation as current mainline for both cmpxchg() and cmpxchg_local() does -- broonie]
--- arch/arm64/include/asm/cmpxchg.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
arch/arm64/include/asm/cmpxchg.h +17 -11
@@ -158,17 +158,23 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old,return ret; } -#define cmpxchg (ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) - -#define cmpxchg_local (ptr,o,n) \ - ((__typeof__(*(ptr)))__cmpxchg((ptr), \ - (unsigned long)(o), \ - (unsigned long)(n), \ - sizeof(*(ptr)))) +#define cmpxchg (ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \ + sizeof(*(ptr))); \ + __ret; \ +}) + +#define cmpxchg_local (ptr, o, n) \ +({ \ + __typeof__(*(ptr)) __ret; \ + __ret = (__typeof__(*(ptr))) \ + __cmpxchg((ptr), (unsigned long)(o), \ + (unsigned long)(n), sizeof(*(ptr))); \ + __ret; \ +})#define cmpxchg64 (ptr,o,n) cmpxchg((ptr),(o),(n))#define cmpxchg64_local (ptr,o,n) cmpxchg_local((ptr),(o),(n))
Signature · 1 line
1.8.5.2
Catalin Marinas
maintainerPATCH 1/1 arm64: cmpxchg: update macros to prevent warnings
Quoted 8 lines · Mark Brown
From: Mark Hambleton <[email protected]>
Make sure the value we are going to return is referenced in order to avoid warnings from newer GCCs such as:
arch/arm64/include/asm/cmpxchg.h:162:3: warning: value computed is not used [-Wunused-value]((__typeof__(*(ptr)))__cmpxchg_mb((ptr), \ ^
Quoted 8 lines
net/netfilter/nf_conntrack_core.c:674:2: note: in expansion of macro ???cmpxchg???
cmpxchg(&nf_conntrack_hash_rnd, 0, rand);[Modified to use the current underlying implementation as current mainline for both
cmpxchg()andcmpxchg_local()does -- broonie]Signed-off-by Mark Hambleton <[email protected]>Signed-off-by Mark Brown <[email protected]>
I merged the previous one (should be in -next as of last night), I guess it's the same since the patch doesn't have a version number. But I wonder whether uses of cmpxchg without checking the return value are sane.
Signature · 1 line
Catalin
PATCH 1/1 arm64: cmpxchg: update macros to prevent warnings
Quoted 2 lines · Catalin Marinas
I merged the previous one (should be in -next as of last night), I guess it's the same since the patch doesn't have a version number. But I
It's the same patch, I was resending it because it had been a while with no response.
Quoted 2 lines
wonder whether uses of cmpxchg without checking the return value are sane.
IIRC it was used as part of another macro which did have some reasonable
uses without checking the return value.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131220/36a0404d/attachment.sig>