X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=urcu%2Farch_x86.h;h=4ba08f7a288796186aeda16679d3fe8a7d558506;hb=e4c9e00cd71d95c4b40244455906983ff81e6991;hp=d455b89b15671fe9a2da8be8dd570907cc01f984;hpb=b4e52e3e9e563d38607a8e0ab0aa72e7ab2b47b4;p=userspace-rcu.git

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index d455b89..4ba08f7 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -23,10 +23,8 @@
  */
 
 #include <urcu/compiler.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/config.h>
 
-/* Assume P4 or newer */
-#define CONFIG_HAVE_FENCE 1
 #define CONFIG_HAVE_MEM_COHERENCY
 
 #define CACHE_LINE_SIZE	128
@@ -35,7 +33,7 @@
 #define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
 #endif
 
-#ifdef CONFIG_HAVE_FENCE
+#ifdef CONFIG_URCU_HAVE_FENCE
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
 #define wmb()   asm volatile("sfence"::: "memory")
@@ -64,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_URCU_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()