Revert "Remove unused define"

[fio.git] / arch / arch-x86_64.h

diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index fabdb9ad923db49458417994ef428b1bf3d9499e..71ba2240180f8937182725812529782f58dd8873 100644 (file)
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -19,23 +19,56 @@
 #endif
 
 #ifndef __NR_async_exec
-#define __NR_async_exec                280
-#define __NR_async_wait                281
-#define __NR_umem_add          282
-#define __NR_async_thread      283
+#define __NR_async_exec                286
+#define __NR_async_wait                287
+#define __NR_umem_add          288
+#define __NR_async_thread      289
 #endif
 
 #define        FIO_HUGE_PAGE           2097152
 
 #define FIO_HAVE_SYSLET
 
-#define nop    __asm__ __volatile__("rep;nop": : :"memory")
+#define nop            __asm__ __volatile__("rep;nop": : :"memory")
+#define read_barrier() __asm__ __volatile__("lfence":::"memory")
+#define write_barrier()        __asm__ __volatile__("sfence":::"memory")
 
-static inline unsigned long fio_ffz(unsigned long bitmask)
+static inline unsigned int arch_ffz(unsigned int bitmask)
 {
-       __asm__("bsfq %1,%0" :"=r" (bitmask) :"r" (~bitmask));
+       __asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
        return bitmask;
 }
+#define ARCH_HAVE_FFZ
 
+typedef struct {
+       unsigned int lock;
+} spinlock_t;
+
+static inline void spin_lock(spinlock_t *lock)
+{
+       short inc = 0x0100;
+
+       __asm__ __volatile__("xaddw %w0, %1\n"
+                       "1:\t"
+                       "cmpb %h0, %b0\n\t"
+                       "je 2f\n\t"
+                       "rep ; nop\n\t"
+                       "movb %1, %b0\n\t"
+                       "jmp 1b\n"
+                       "2:"
+                       : "+Q" (inc), "+m" (lock->lock)
+                       :
+                       : "memory", "cc");
+}
+
+static inline void spin_unlock(spinlock_t *lock)
+{
+       __asm__ __volatile__("incb %0"
+                       : "+m" (lock->lock)
+                       :
+                       : "memory", "cc");
+}
+
+#define __SPIN_LOCK_UNLOCKED   { 0 }
 
 #endif