Cleanup: remove unused value warning

[urcu.git] / urcu / arch_s390.h

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 4ad3ee8edd39e8c9f7752ebc0d82db4e90722280..1f03c784cb32bcc3da7c4c724b5fc7eaf632c501 100644 (file)
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -35,25 +35,13 @@
 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;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t cycles;