From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 23 Jan 2019 15:04:28 +0000 (-0700)
Subject: io_uring: system calls have been renumbered
X-Git-Tag: fio-3.13~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=63ed82548f4489b4c6d5df688f7405b9eb20ddc9;p=fio.git

io_uring: system calls have been renumbered

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/arch/arch-x86-common.h b/arch/arch-x86-common.h
index 5140f238..7c07a61c 100644
--- a/arch/arch-x86-common.h
+++ b/arch/arch-x86-common.h
@@ -3,6 +3,16 @@
 
 #include <string.h>
 
+#ifndef __NR_sys_io_uring_setup
+#define __NR_sys_io_uring_setup		425
+#endif
+#ifndef __NR_sys_io_uring_enter
+#define __NR_sys_io_uring_enter		426
+#endif
+#ifndef __NR_sys_io_uring_register
+#define __NR_sys_io_uring_register	427
+#endif
+
 static inline void cpuid(unsigned int op,
 			 unsigned int *eax, unsigned int *ebx,
 			 unsigned int *ecx, unsigned int *edx)
@@ -13,6 +23,7 @@ static inline void cpuid(unsigned int op,
 }
 
 #define ARCH_HAVE_INIT
+#define ARCH_HAVE_IOURING
 
 extern bool tsc_reliable;
 extern int arch_random;
diff --git a/arch/arch-x86.h b/arch/arch-x86.h
index c1c866ea..c6bcb54c 100644
--- a/arch/arch-x86.h
+++ b/arch/arch-x86.h
@@ -1,16 +1,6 @@
 #ifndef ARCH_X86_H
 #define ARCH_X86_H
 
-#ifndef __NR_sys_io_uring_setup
-#define __NR_sys_io_uring_setup		387
-#endif
-#ifndef __NR_sys_io_uring_enter
-#define __NR_sys_io_uring_enter		388
-#endif
-#ifndef __NR_sys_io_uring_register
-#define __NR_sys_io_uring_register	389
-#endif
-
 static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
 			    unsigned int *ecx, unsigned int *edx)
 {
@@ -46,6 +36,5 @@ static inline unsigned long long get_cpu_clock(void)
 
 #define ARCH_HAVE_FFZ
 #define ARCH_HAVE_CPU_CLOCK
-#define ARCH_HAVE_IOURING
 
 #endif
diff --git a/arch/arch-x86_64.h b/arch/arch-x86_64.h
index 0cd21b8f..25850f90 100644
--- a/arch/arch-x86_64.h
+++ b/arch/arch-x86_64.h
@@ -1,16 +1,6 @@
 #ifndef ARCH_X86_64_H
 #define ARCH_X86_64_H
 
-#ifndef __NR_sys_io_uring_setup
-#define __NR_sys_io_uring_setup		335
-#endif
-#ifndef __NR_sys_io_uring_enter
-#define __NR_sys_io_uring_enter		336
-#endif
-#ifndef __NR_sys_io_uring_register
-#define __NR_sys_io_uring_register	337
-#endif
-
 static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
 			    unsigned int *ecx, unsigned int *edx)
 {
@@ -47,7 +37,6 @@ static inline unsigned long long get_cpu_clock(void)
 #define ARCH_HAVE_FFZ
 #define ARCH_HAVE_SSE4_2
 #define ARCH_HAVE_CPU_CLOCK
-#define ARCH_HAVE_IOURING
 
 #define RDRAND_LONG	".byte 0x48,0x0f,0xc7,0xf0"
 #define RDSEED_LONG	".byte 0x48,0x0f,0xc7,0xf8"