X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=8d1483abb4aff07c4b129c3e758887af58468ee5;hb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be;hp=4ad3ee8edd39e8c9f7752ebc0d82db4e90722280;hpb=e4d1eb09301904b56cdf22e1d6042df4492d57cb;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 4ad3ee8..8d1483a 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -35,21 +35,9 @@
 extern "C" {
 #endif 
 
-#define CACHE_LINE_SIZE	128
+#define CAA_CACHE_LINE_SIZE	128
 
-#ifndef __SIZEOF_LONG__
-#ifdef __s390x__
-#define __SIZEOF_LONG__ 8
-#else
-#define __SIZEOF_LONG__ 4
-#endif
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
-#define mb()    __asm__ __volatile__("bcr 15,0" : : : "memory")
+#define cmm_mb()    __asm__ __volatile__("bcr 15,0" : : : "memory")
 
 typedef unsigned long long cycles_t;