Rename all memory primitives with prefix cmm_

[urcu.git] / urcu / arch_s390.h

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 4ad3ee8edd39e8c9f7752ebc0d82db4e90722280..8a33e203ecb8cee76e5f6c1a1e5b662a5395837a 100644 (file)
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -37,19 +37,7 @@ extern "C" {
 
 #define 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;