Revert "Remove unused define"

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

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 574383a65e0c4ca90ea9a2271b51e2390182f10c..b9249eae6f449d4f04e6fc2e6f25873eb9763527 100644 (file)
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -19,22 +19,56 @@
 #endif
 
 #ifndef __NR_async_exec
-#define __NR_async_exec                320
-#define __NR_async_wait                321
-#define __NR_umem_add          322
-#define __NR_async_thread      323
+#define __NR_async_exec                325
+#define __NR_async_wait                326
+#define __NR_umem_add          327
+#define __NR_async_thread      328
 #endif
 
 #define        FIO_HUGE_PAGE           4194304
 
 #define FIO_HAVE_SYSLET
 
-#define nop    __asm__ __volatile__("rep;nop": : :"memory")
+#define nop            __asm__ __volatile__("rep;nop": : :"memory")
+#define read_barrier() __asm__ __volatile__("": : :"memory")
+#define write_barrier()        __asm__ __volatile__("": : :"memory")
 
-static inline unsigned long fio_ffz(unsigned long bitmask)
+static inline unsigned long arch_ffz(unsigned long 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