X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=arch%2Farch-x86.h;h=457b44c17eb3ad52cb51a98858c90ab2255ec55b;hp=51d7d9674bc220a9a33fff008c52b4c0555359c8;hb=e6fe02651641fc64d2fa4fcfe9b1013b2947d11b;hpb=edf2c6cf5adc82ee43c81e033cf2215eb9ffdb16

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 51d7d967..457b44c1 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,34 +1,21 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#define ARCH	(arch_i386)
-
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set		289
-#define __NR_ioprio_get		290
-#endif
-
-#ifndef __NR_fadvise64
-#define __NR_fadvise64		250
-#endif
+static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
+			    unsigned int *ecx, unsigned int *edx)
+{
+	asm volatile("xchgl %%ebx, %1\ncpuid\nxchgl %%ebx, %1"
+		: "=a" (*eax), "=r" (*ebx), "=c" (*ecx), "=d" (*edx)
+		: "0" (*eax)
+		: "memory");
+}
 
-#ifndef __NR_sys_splice
-#define __NR_sys_splice		313
-#define __NR_sys_tee		315
-#define __NR_sys_vmsplice	316
-#endif
+#include "arch-x86-common.h"
 
-#ifndef __NR_async_exec
-#define __NR_async_exec		325
-#define __NR_async_wait		326
-#define __NR_umem_add		327
-#define __NR_async_thread	328
-#endif
+#define FIO_ARCH	(arch_x86)
 
 #define	FIO_HUGE_PAGE		4194304
 
-#define FIO_HAVE_SYSLET
-
 #define nop		__asm__ __volatile__("rep;nop": : :"memory")
 #define read_barrier()	__asm__ __volatile__("": : :"memory")
 #define write_barrier()	__asm__ __volatile__("": : :"memory")
@@ -38,35 +25,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;
+	unsigned long long ret;
 
-	__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");
+	__asm__ __volatile__("rdtsc" : "=A" (ret));
+	return ret;
 }
 
-static inline void spin_unlock(spinlock_t *lock)
-{
-	__asm__ __volatile__("incb %0"
-			: "+m" (lock->lock)
-			:
-			: "memory", "cc");
-}
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
 
 #endif