X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-x86.h;h=457b44c17eb3ad52cb51a98858c90ab2255ec55b;hb=48d86be55597762c6747081aae1936f49429d13b;hp=aa106920aeaf5cae6a1159d64bb9818196be3be5;hpb=317b95d07d4921d2594a1be6e014c9c2d062fe75;p=fio.git

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index aa106920..457b44c1 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,40 +1,40 @@
 #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		320
-#define __NR_async_wait		321
-#define __NR_umem_add		322
-#define __NR_async_thread	323
-#endif
+#define FIO_ARCH	(arch_x86)
 
 #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 ffz(unsigned long bitmask)
+static inline unsigned long arch_ffz(unsigned long bitmask)
 {
 	__asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
 	return bitmask;
 }
 
+static inline unsigned long long get_cpu_clock(void)
+{
+	unsigned long long ret;
+
+	__asm__ __volatile__("rdtsc" : "=A" (ret));
+	return ret;
+}
+
+#define ARCH_HAVE_FFZ
+#define ARCH_HAVE_CPU_CLOCK
+
 #endif