X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-x86.h;h=385a9124ec5ee9ef416201ba6d730b6d3aafd7e1;hb=aa1af5fd4a7b801cc506cb511eb09f64c89648b6;hp=97262ffe0769f9a445fe3042031867987350d9a2;hpb=44c47feb9edc7854bf3cfa2e3d843e90fc969b3a;p=fio.git

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 97262ffe..385a9124 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,7 +1,18 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#define ARCH	(arch_i386)
+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");
+}
+
+#include "arch-x86-common.h"
+
+#define FIO_ARCH	(arch_i386)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		289
@@ -18,17 +29,8 @@
 #define __NR_sys_vmsplice	316
 #endif
 
-#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_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,6 +40,16 @@ 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