X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-x86.h;h=457b44c17eb3ad52cb51a98858c90ab2255ec55b;hb=b9c153b9023c3de65f01aeac4d1e993986a7107e;hp=679ec2816992a3c7fa82a00b520cd24a82a936ca;hpb=67bf982340d95ca98098ea050b54b4c7adb116c0;p=fio.git

diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index 679ec281..457b44c1 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,24 +1,18 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#include "arch-x86-common.h"
-
-#define FIO_ARCH	(arch_i386)
-
-#ifndef __NR_ioprio_set
-#define __NR_ioprio_set		289
-#define __NR_ioprio_get		290
-#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_fadvise64
-#define __NR_fadvise64		250
-#endif
+#include "arch-x86-common.h"
 
-#ifndef __NR_sys_splice
-#define __NR_sys_splice		313
-#define __NR_sys_tee		315
-#define __NR_sys_vmsplice	316
-#endif
+#define FIO_ARCH	(arch_x86)
 
 #define	FIO_HUGE_PAGE		4194304
 
@@ -34,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;