X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Farch_armv7l.h;h=125066b8239190b5be4580c11ba406a7baa8be7e;hb=71bce82c1a1ad4f5718a4de3d27bdf7c1945d4b7;hp=e63ad3cf0c88613a35cdab34f1ee04e9033bf664;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e;p=urcu.git

diff --git a/urcu/arch_armv7l.h b/urcu/arch_armv7l.h
index e63ad3c..125066b 100644
--- 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;