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

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 2e803cbe..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")
@@ -41,7 +28,7 @@ static inline unsigned long arch_ffz(unsigned long bitmask)
 
 static inline unsigned long long get_cpu_clock(void)
 {
-	unsigned long ret;
+	unsigned long long ret;
 
 	__asm__ __volatile__("rdtsc" : "=A" (ret));
 	return ret;