X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fuatomic_arch_s390.h;h=a8c8706e7b10c372ffe065394772b3c5089edbcb;hb=1cf421dc065a15129aa389781dd95b7206290fa3;hp=b67259ec082c7d26ac947ec6087c5f98e12963a4;hpb=2837ec4082909692bd56aa2b0e217d3e30a3e71b;p=urcu.git

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index b67259e..a8c8706 100644
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -48,6 +48,8 @@
 #define uatomic_read(addr)	LOAD_SHARED(*(addr))
 
 /* xchg */
+
+static inline __attribute__((always_inline))
 unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 {
 	switch (len) {
@@ -61,6 +63,7 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 			: "=&r"(old_val), "=m" (*addr)
 			: "r"(val), "m" (*addr)
 			: "memory", "cc");
+		return old_val;
 	}
 #if (BITS_PER_LONG == 64)
 	case 8:
@@ -73,6 +76,7 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 			: "=&r"(old_val), "=m" (*addr)
 			: "r"(val), "m" (*addr)
 			: "memory", "cc");
+		return old_val;
 	}
 #endif
 	default:
@@ -90,7 +94,7 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 
 static inline __attribute__((always_inline))
 unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
-			       unsigned long new, int len)
+			       unsigned long _new, int len)
 {
 	switch (len) {
 	case 4:
@@ -100,18 +104,20 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 		__asm__ __volatile__(
 			"	cs %0,%2,%1\n"
 			: "+r"(old_val), "+m"(*addr)
-			: "r"(new)
+			: "r"(_new)
 			: "memory", "cc");
 		return old_val;
 	}
 #if (BITS_PER_LONG == 64)
 	case 8:
+	{
 		__asm__ __volatile__(
 			"	csg %0,%2,%1\n"
 			: "+r"(old), "+m"(*addr)
-			: "r"(new)
+			: "r"(_new)
 			: "memory", "cc");
 		return old;
+	}
 #endif
 	default:
 		__asm__ __volatile__(".long	0xd00d00");
@@ -120,10 +126,10 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 	return 0;
 }
 
-#define uatomic_cmpxchg(addr, old, new)					\
+#define uatomic_cmpxchg(addr, old, _new)				\
 	(__typeof__(*(addr))) _uatomic_cmpxchg((addr),			\
 					       (unsigned long)(old),	\
-					       (unsigned long)(new),	\
+					       (unsigned long)(_new),	\
 					       sizeof(*(addr)))
 
 /* uatomic_add_return */