X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_x86.h;h=4abac2bb304de37a42855924de0c7bedbb8bab78;hb=d4fc680a1b809d90cb28f144c5d3e1143171bbab;hp=29612e0a98aa3bfbae4de0ff865259f2418de27d;hpb=ec4e58a3aba2084440012f8ccac3a31eb6101183;p=urcu.git

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index 29612e0..4abac2b 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -23,17 +23,17 @@
  */
 
 #include <urcu/compiler.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
-/* Assume P4 or newer */
-#define CONFIG_HAVE_FENCE 1
 #define CONFIG_HAVE_MEM_COHERENCY
 
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
+#define CACHE_LINE_SIZE	128
 
-#ifdef CONFIG_HAVE_FENCE
+#ifdef CONFIG_RCU_HAVE_FENCE
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
 #define wmb()   asm volatile("sfence"::: "memory")
@@ -62,10 +62,7 @@
 #define rmc()	barrier()
 #define wmc()	barrier()
 
-/* Assume SMP machine, given we don't have this information */
-#define CONFIG_SMP 1
-
-#ifdef CONFIG_SMP
+#ifdef CONFIG_RCU_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()
@@ -132,4 +129,8 @@ static inline cycles_t get_cycles(void)
         return ret;
 }
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_ARCH_X86_H */