X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-x86.h;h=b9249eae6f449d4f04e6fc2e6f25873eb9763527;hp=343e51ab5b0853a5ea94f3f1f3a6f5e4033ad922;hb=61a179a8fa701a2f5e9cd92b78ccc98f96b9f1d4;hpb=db6defc77508f5bf217f0a6768d13426eee21119

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 343e51ab..b9249eae 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -30,12 +30,45 @@
 #define FIO_HAVE_SYSLET
 
 #define nop		__asm__ __volatile__("rep;nop": : :"memory")
-#define read_barrier()	asm volatile ("": : :"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