[PATCH] arm: cmpxchg: update macro to prevent compiler warning

[PATCH] arm: cmpxchg: update macro to prevent compiler warning

[Andre Przywara]

In kernel/acct.c we call the cmpxchg() macro without using it's
return value, so the compiler complains when compiling for ARM:

kernel/acct.c: In function 'acct_pin_kill':
arch/arm/include/asm/cmpxchg.h:205:3: warning: value computed is not used [-Wunused-value]
  ((__typeof__(*(ptr)))__cmpxchg_mb((ptr),   \
   ^
kernel/acct.c:174:2: note: in expansion of macro 'cmpxchg'
  cmpxchg(&acct->ns->bacct, pin, NULL);
  ^

Rearrange the macro along the lines of a similar patch for arm64
60010e508111 ("arm64: cmpxchg: update macros to prevent warnings")
to fix the warning.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Cc: Mark Hambleton <Mark.Hambleton@arm.com>
---
 arch/arm/include/asm/cmpxchg.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
index abb2c37..dc27aaf 100644
--- a/arch/arm/include/asm/cmpxchg.h
+++ b/arch/arm/include/asm/cmpxchg.h
@@ -201,11 +201,16 @@ 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(ptr, o, n)						\
+({									\
+	__typeof__(*(ptr)) __ret;					\
+	__ret = (__typeof__(*(ptr)))					\
+		__cmpxchg_mb((ptr),					\
+			     (unsigned long)(o),			\
+			     (unsigned long)(n),			\
+			     sizeof(*(ptr)));				\
+	__ret;								\
+})
 
 static inline unsigned long __cmpxchg_local(volatile void *ptr,
 					    unsigned long old,
-- 
2.3.5

[PATCH] arm: cmpxchg: update macro to prevent compiler warning

[Russell King - ARM Linux]

On Wed, Jun 17, 2015 at 05:37:36PM +0100, Andre Przywara wrote:
> In kernel/acct.c we call the cmpxchg() macro without using it's
> return value, so the compiler complains when compiling for ARM:

A fix is already queued, and has been queued since 26th May.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.