URCU list: remove leftover namespace clash (list_t type removed)

[urcu.git] / urcu / arch_armv7l.h

diff --git a/urcu/arch_armv7l.h b/urcu/arch_armv7l.h
index e63ad3cf0c88613a35cdab34f1ee04e9033bf664..125066b8239190b5be4580c11ba406a7baa8be7e 100644 (file)
--- a/urcu/arch_armv7l.h
+++ b/urcu/arch_armv7l.h
@@ -29,14 +29,14 @@
 extern "C" {
 #endif 
 
-#define mb()    asm volatile("dmb":::"memory")
+#define cmm_mb()    asm volatile("dmb":::"memory")
 
 #include <stdlib.h>
 #include <sys/time.h>
 
 typedef unsigned long long cycles_t;
 
-static inline cycles_t get_cycles (void)
+static inline cycles_t caa_get_cycles (void)
 {
        cycles_t thetime;
        struct timeval tv;