These macros are not defined in a old <sys/syscall.h> file. Allow liburing users to get io_uring syscall numbers by including <liburing.h>. Signed-off-by: Ammar Faizi <ammarfaizi2@xxxxxxxxxxx> --- src/include/liburing.h | 38 ++++++++++++++++++++++++++++++++++++++ src/syscall.h | 37 ------------------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/include/liburing.h b/src/include/liburing.h index 6040a06..cceab6b 100644 --- a/src/include/liburing.h +++ b/src/include/liburing.h @@ -33,6 +33,44 @@ #define uring_likely(cond) __builtin_expect(!!(cond), 1) #endif + +#ifdef __alpha__ +/* + * alpha and mips are exception, other architectures have + * common numbers for new system calls. + */ +#ifndef __NR_io_uring_setup +#define __NR_io_uring_setup 535 +#endif +#ifndef __NR_io_uring_enter +#define __NR_io_uring_enter 536 +#endif +#ifndef __NR_io_uring_register +#define __NR_io_uring_register 537 +#endif +#elif defined __mips__ +#ifndef __NR_io_uring_setup +#define __NR_io_uring_setup (__NR_Linux + 425) +#endif +#ifndef __NR_io_uring_enter +#define __NR_io_uring_enter (__NR_Linux + 426) +#endif +#ifndef __NR_io_uring_register +#define __NR_io_uring_register (__NR_Linux + 427) +#endif +#else /* !__alpha__ and !__mips__ */ +#ifndef __NR_io_uring_setup +#define __NR_io_uring_setup 425 +#endif +#ifndef __NR_io_uring_enter +#define __NR_io_uring_enter 426 +#endif +#ifndef __NR_io_uring_register +#define __NR_io_uring_register 427 +#endif +#endif + + #ifdef __cplusplus extern "C" { #endif diff --git a/src/syscall.h b/src/syscall.h index ba008ea..f750782 100644 --- a/src/syscall.h +++ b/src/syscall.h @@ -10,45 +10,8 @@ #include <sys/mman.h> #include <sys/syscall.h> #include <sys/resource.h> - #include <liburing.h> -#ifdef __alpha__ -/* - * alpha and mips are exception, other architectures have - * common numbers for new system calls. - */ -#ifndef __NR_io_uring_setup -#define __NR_io_uring_setup 535 -#endif -#ifndef __NR_io_uring_enter -#define __NR_io_uring_enter 536 -#endif -#ifndef __NR_io_uring_register -#define __NR_io_uring_register 537 -#endif -#elif defined __mips__ -#ifndef __NR_io_uring_setup -#define __NR_io_uring_setup (__NR_Linux + 425) -#endif -#ifndef __NR_io_uring_enter -#define __NR_io_uring_enter (__NR_Linux + 426) -#endif -#ifndef __NR_io_uring_register -#define __NR_io_uring_register (__NR_Linux + 427) -#endif -#else /* !__alpha__ and !__mips__ */ -#ifndef __NR_io_uring_setup -#define __NR_io_uring_setup 425 -#endif -#ifndef __NR_io_uring_enter -#define __NR_io_uring_enter 426 -#endif -#ifndef __NR_io_uring_register -#define __NR_io_uring_register 427 -#endif -#endif - /* * Don't put this below the #include "arch/$arch/syscall.h", that * file may need it. base-commit: 42ee2bdb76022fc11d7a0ad8ec5cca6de73501e9 -- Ammar Faizi