X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-x86.h;h=1ededd845a869b8751c64ed0a06e5bd41aad3273;hp=b9249eae6f449d4f04e6fc2e6f25873eb9763527;hb=45054cbec0e624de3b79a795d7dfe1c64cdea934;hpb=69ebbd397e80b23ec4281c99e9f7242a089cc771

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index b9249eae..1ededd84 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,7 +1,7 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#define ARCH	(arch_i386)
+#define FIO_ARCH	(arch_i386)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		289
@@ -38,37 +38,16 @@ 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)
+static inline unsigned long long get_cpu_clock(void)
 {
-	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");
-}
+	unsigned long ret;
 
-static inline void spin_unlock(spinlock_t *lock)
-{
-	__asm__ __volatile__("incb %0"
-			: "+m" (lock->lock)
-			:
-			: "memory", "cc");
+	__asm__ __volatile__("rdtsc" : "=A" (ret));
+	return ret;
 }
 
-#define __SPIN_LOCK_UNLOCKED	{ 0 }
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
 
 #endif