Add initial support x86-64 ASM header.

2 files changed, 8 insertions, 3 deletions

diff --git a/include/asm.h b/include/asm.h
index a58622e..bc15fae 100644
--- a/include/asm.h
+++ b/include/asm.h
@@ -3,10 +3,11 @@
 #ifndef ASM_H
 #define ASM_H
 
-#ifdef __i386__
-#include "asm_i386.h"
+#if defined(__i386__) || defined(__x86_64__)
+#include "asm_x86.h"
 #endif
 
+
 #ifdef __sparc__
 #include "asm_sparc.h"
 #endif
diff --git a/include/asm_i386.h b/include/asm_x86.h
index e077ddc..b5bf166 100644
--- a/include/asm_i386.h
+++ b/include/asm_x86.h
@@ -8,7 +8,7 @@
 
 static inline void barrier(void)
 {
-        __asm__ __volatile__("sfence": : :"memory");
+        __asm__ __volatile__("mfence": : :"memory");
 }
 
 static __inline__ void cpu_relax(void)
@@ -16,6 +16,9 @@ static __inline__ void cpu_relax(void)
         __asm__ __volatile("pause");
 }
 
+
+#ifdef __i386__
+
 typedef struct { int counter; } atomic_t;
 
 #define ATOMIC_INIT(i)  { (i) }
@@ -66,3 +69,4 @@ static __inline__ int atomic_add_return(int i, atomic_t *v)
 #define atomic_inc_return(v)  (atomic_add_return(1,v))
 
 
+#endif