X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic_arch_s390.h;h=2378ebd202ba256310f5edfcffcd7d278f5fef7f;hp=813d9708a8efff783938a24c3e55987c64042436;hb=8760d94e0ef6d52260765a9246aaac073613055e;hpb=36bc70a84250927ba68d5096a0a9740aec157f9b

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index 813d970..2378ebd 100644
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -62,13 +62,13 @@ extern "C" {
 #ifdef COMPILER_HAVE_SHORT_MEM_OPERAND
 
 #define MEMOP_OUT(addr)	"=Q" (*(addr))
-#define MEMOP_IN	"Q" (*(addr))
+#define MEMOP_IN(addr)	"Q" (*(addr))
 #define MEMOP_REF(op)	#op		/* op refer to MEMOP_IN operand */
 
 #else /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 
 #define MEMOP_OUT(addr)	"=m" (*(addr))
-#define MEMOP_IN	"a" (addr), "m" (*(addr))
+#define MEMOP_IN(addr)	"a" (addr), "m" (*(addr))
 #define MEMOP_REF(op)	"0(" #op ")"	/* op refer to MEMOP_IN operand */
 
 #endif /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
@@ -78,9 +78,6 @@ struct __uatomic_dummy {
 };
 #define __hp(x)	((struct __uatomic_dummy *)(x))
 
-#define uatomic_set(addr, v)	STORE_SHARED(*(addr), (v))
-#define uatomic_read(addr)	LOAD_SHARED(*(addr))
-
 /* xchg */
 
 static inline __attribute__((always_inline))
@@ -208,20 +205,10 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 						  (unsigned long)(v),	\
 						  sizeof(*(addr))))
 
-/* uatomic_sub_return, uatomic_add, uatomic_sub, uatomic_inc, uatomic_dec */
-
-#define uatomic_sub_return(addr, v)	uatomic_add_return((addr), -(v))
-
-#define uatomic_add(addr, v)		(void)uatomic_add_return((addr), (v))
-#define uatomic_sub(addr, v)		(void)uatomic_sub_return((addr), (v))
-
-#define uatomic_inc(addr)		uatomic_add((addr), 1)
-#define uatomic_dec(addr)		uatomic_add((addr), -1)
-
-#define compat_uatomic_cmpxchg(ptr, old, _new)	uatomic_cmpxchg(ptr, old, _new)
-
 #ifdef __cplusplus 
 }
 #endif
 
+#include <urcu/uatomic_generic.h>
+
 #endif /* _URCU_UATOMIC_ARCH_S390_H */