From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 17 Jul 2006 14:09:18 +0000 (+0200)
Subject: [S390] Fix gcc warning about unused return values.
X-Git-Tag: v2.6.18-rc3~77^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a651c93d3a823af63b1b15bb94fdc951670fb2f;p=linux-2.6-omap-h63xx.git

[S390] Fix gcc warning about unused return values.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index 36a3a85d611..16040048cd1 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -128,8 +128,13 @@ extern void account_system_vtime(struct task_struct *);
 
 #define nop() __asm__ __volatile__ ("nop")
 
-#define xchg(ptr,x) \
-  ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(void *)(ptr),sizeof(*(ptr))))
+#define xchg(ptr,x)							  \
+({									  \
+	__typeof__(*(ptr)) __ret;					  \
+	__ret = (__typeof__(*(ptr)))					  \
+		__xchg((unsigned long)(x), (void *)(ptr),sizeof(*(ptr))); \
+	__ret;								  \
+})
 
 static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
 {