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

Commit 60010e50 authored by Mark Hambleton's avatar Mark Hambleton Committed by Catalin Marinas
Browse files

arm64: cmpxchg: update macros to prevent warnings 



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]

Signed-off-by: default avatarMark Hambleton <mahamble@broadcom.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent ee6214ce

arch/arm64/include/asm/cmpxchg.h

+17 −11
Original line number Original line Diff line number Diff line
@@ -159,16 +159,22 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old, 
}

}





#define cmpxchg(ptr, o, n) \

#define cmpxchg(ptr, o, n) \

	((__typeof__(*(ptr)))__cmpxchg_mb((ptr),			\

({ \

					  (unsigned long)(o),		\

	__typeof__(*(ptr)) __ret; \

					  (unsigned long)(n),		\

	__ret = (__typeof__(*(ptr))) \

					  sizeof(*(ptr))))

		__cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \

			     sizeof(*(ptr))); \

	__ret; \

})





#define cmpxchg_local(ptr, o, n) \

#define cmpxchg_local(ptr, o, n) \

	((__typeof__(*(ptr)))__cmpxchg((ptr),				\

({ \

				       (unsigned long)(o),		\

	__typeof__(*(ptr)) __ret; \

				       (unsigned long)(n),		\

	__ret = (__typeof__(*(ptr))) \

				       sizeof(*(ptr))))

		__cmpxchg((ptr), (unsigned long)(o), \

			  (unsigned long)(n), sizeof(*(ptr))); \

	__ret; \

})





#define cmpxchg64(ptr,o,n)		cmpxchg((ptr),(o),(n))

#define cmpxchg64(ptr,o,n)		cmpxchg((ptr),(o),(n))

#define cmpxchg64_local(ptr,o,n)	cmpxchg_local((ptr),(o),(n))

#define cmpxchg64_local(ptr,o,n)	cmpxchg_local((ptr),(o),(n))