Cleanup: move generic caa_get_cycles to arch/generic.h

[urcu.git] / urcu / arch / x86.h

diff --git a/urcu/arch/x86.h b/urcu/arch/x86.h
index 7af1ca524e091fb9f9aaa8b6c2d1d102d3abe270..afbf4fad37b68b8cb18f2eccb15f8c308e1eb02d 100644 (file)
--- a/urcu/arch/x86.h
+++ b/urcu/arch/x86.h
@@ -24,6 +24,7 @@
 
 #include <urcu/compiler.h>
 #include <urcu/config.h>
+#include <urcu/syscall-compat.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,7 +67,9 @@ extern "C" {
 #endif
 #endif
 
-#define caa_cpu_relax()        __asm__ __volatile__ ("rep; nop" : : : "memory");
+#define caa_cpu_relax()        __asm__ __volatile__ ("rep; nop" : : : "memory")
+
+#define HAS_CAA_GET_CYCLES
 
 #define rdtscll(val)                                                     \
        do {                                                              \
@@ -86,6 +89,20 @@ static inline cycles_t caa_get_cycles(void)
         return ret;
 }
 
+/*
+ * Define the membarrier system call number if not yet available in the
+ * system headers.
+ */
+#if (CAA_BITS_PER_LONG == 32)
+#ifndef __NR_membarrier
+#define __NR_membarrier                375
+#endif
+#else
+#ifndef __NR_membarrier
+#define __NR_membarrier                324
+#endif
+#endif
+
 #ifdef __cplusplus 
 }
 #endif