X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch%2Farm.h;h=5cbca7d7f1d0d523186b40837ce93ff515615128;hp=b49f7821052b5e00d0fd30d09145d72c95bc970a;hb=a59f39055b5ecb77b68cf78b9839aa9e8e4ec332;hpb=bc2433a9853a945a825c244e9ccfe341b73b2ceb

diff --git a/urcu/arch/arm.h b/urcu/arch/arm.h
index b49f782..5cbca7d 100644
--- a/urcu/arch/arm.h
+++ b/urcu/arch/arm.h
@@ -24,34 +24,30 @@
 
 #include <urcu/compiler.h>
 #include <urcu/config.h>
+#include <urcu/syscall-compat.h>
 
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
 #ifdef CONFIG_RCU_ARM_HAVE_DMB
-#define cmm_mb()	asm volatile("dmb":::"memory")
-#define cmm_rmb()	asm volatile("dmb":::"memory")
-#define cmm_wmb()	asm volatile("dmb":::"memory")
+#define cmm_mb()	__asm__ __volatile__ ("dmb":::"memory")
+#define cmm_rmb()	__asm__ __volatile__ ("dmb":::"memory")
+#define cmm_wmb()	__asm__ __volatile__ ("dmb":::"memory")
 #endif /* CONFIG_RCU_ARM_HAVE_DMB */
 
 #include <stdlib.h>
 #include <sys/time.h>
 
-typedef unsigned long long cycles_t;
-
-static inline cycles_t caa_get_cycles (void)
-{
-	cycles_t thetime;
-	struct timeval tv;
-
-	if (gettimeofday(&tv, NULL) != 0)
-		return 0;
-	thetime = ((cycles_t)tv.tv_sec) * 1000000ULL + ((cycles_t)tv.tv_usec);
-	return (cycles_t)thetime;
-}
+/*
+ * On Linux, define the membarrier system call number if not yet available in
+ * the system headers.
+ */
+#if (defined(__linux__) && !defined(__NR_membarrier))
+#define __NR_membarrier		389
+#endif
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif