1 files changed, 6 insertions, 2 deletions

diff --git a/arch/openrisc/include/asm/cmpxchg.h b/arch/openrisc/include/asm/cmpxchg.h
index 5fcb9ac72693..f0a5d8b844d6 100644
--- a/arch/openrisc/include/asm/cmpxchg.h
+++ b/arch/openrisc/include/asm/cmpxchg.h
@@ -77,7 +77,11 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr,
         return val;
 }
 
-#define xchg(ptr, with) \
-        ((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), sizeof(*(ptr))))
+#define xchg(ptr, with)                                                 \
+        ({                                                              \
+                (__typeof__(*(ptr))) __xchg((unsigned long)(with),      \
+                                            (ptr),                      \
+                                            sizeof(*(ptr)));            \
+        })
 
 #endif /* __ASM_OPENRISC_CMPXCHG_H */