splice: fix fallback from copy vmsplice to nothing

[fio.git] / arch / arch-x86_64.h

diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index 4e0ad5f6e36ab0dcc3e1c37a461a65470a42a3dd..4f75addc1be14fd35d46e9631a57b50978bb6023 100644 (file)
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -19,10 +19,10 @@
 #endif
 
 #ifndef __NR_async_exec
-#define __NR_async_exec                280
-#define __NR_async_wait                281
-#define __NR_umem_add          282
-#define __NR_async_thread      283
+#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
@@ -31,7 +31,7 @@
 
 #define nop    __asm__ __volatile__("rep;nop": : :"memory")
 
-static inline unsigned long ffz(unsigned long bitmask)
+static inline unsigned long fio_ffz(unsigned long bitmask)
 {
        __asm__("bsfq %1,%0" :"=r" (bitmask) :"r" (~bitmask));
        return bitmask;