move config.h to urcu/config.h and install it

[urcu.git] / urcu / arch_x86.h

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index 29612e0a98aa3bfbae4de0ff865259f2418de27d..a72ef064d236c21d45086fd86293edd251943591 100644 (file)
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -23,12 +23,12 @@
  */
 
 #include <urcu/compiler.h>
  */
 
 #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 CONFIG_HAVE_MEM_COHERENCY
 

+#define CACHE_LINE_SIZE        128
+

 #ifndef BITS_PER_LONG
 #define BITS_PER_LONG  (__SIZEOF_LONG__ * 8)
 #endif
 #ifndef BITS_PER_LONG
 #define BITS_PER_LONG  (__SIZEOF_LONG__ * 8)
 #endif


@@ -62,9 +62,6 @@
 #define rmc()  barrier()
 #define wmc()  barrier()
 
 #define rmc()  barrier()
 #define wmc()  barrier()
 

-/* Assume SMP machine, given we don't have this information */
-#define CONFIG_SMP 1
-

 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 #define smp_rmb()      rmb()
 #ifdef CONFIG_SMP
 #define smp_mb()       mb()
 #define smp_rmb()      rmb()