X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=arch%2Farch-x86_64.h;h=cea0451d8ba6f3788e7658508a27863f494ac590;hb=32bbd3ab7846a8c140fda5c83d95c21c447c844c;hp=6dbeee06a6ed2999de25909287b6431828b30107;hpb=2f68124f26e54233db41b462a257dabc48e5c32b;p=fio.git

diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index 6dbeee06..cea0451d 100644
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -1,7 +1,9 @@
 #ifndef ARCH_X86_64_h
 #define ARCH_X86_64_h
 
-#define ARCH	(arch_x86_64)
+#include "arch-x86-common.h"
+
+#define FIO_ARCH	(arch_x86_64)
 
 #ifndef __NR_ioprio_set
 #define __NR_ioprio_set		251
@@ -18,24 +20,15 @@
 #define __NR_sys_vmsplice	278
 #endif
 
-#ifndef __NR_async_exec
-#define __NR_async_exec		286
-#define __NR_async_wait		287
-#define __NR_umem_add		288
-#define __NR_async_thread	289
-#endif
-
 #define	FIO_HUGE_PAGE		2097152
 
-#define FIO_HAVE_SYSLET
-
 #define nop		__asm__ __volatile__("rep;nop": : :"memory")
 #define read_barrier()	__asm__ __volatile__("lfence":::"memory")
 #define write_barrier()	__asm__ __volatile__("sfence":::"memory")
 
-static inline unsigned int arch_ffz(unsigned int bitmask)
+static inline unsigned long arch_ffz(unsigned long bitmask)
 {
-	__asm__("bsfl %1,%0" :"=r" (bitmask) :"r" (~bitmask));
+	__asm__("bsf %1,%0" :"=r" (bitmask) :"r" (~bitmask));
 	return bitmask;
 }