From: Ammar Faizi <[email protected]>
To: Jens Axboe <[email protected]>
Cc: Ammar Faizi <[email protected]>,
Alviro Iskandar Setiawan <[email protected]>,
Fernanda Ma'rouf <[email protected]>,
Pavel Begunkov <[email protected]>,
Hao Xu <[email protected]>,
io-uring Mailing List <[email protected]>,
GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH liburing v1 6/9] arch: syscall: Remove `__INTERNAL__LIBURING_SYSCALL_H` checks
Date: Wed, 29 Jun 2022 07:27:50 +0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
From: Ammar Faizi <[email protected]>
We will include the syscall.h from another place as well. This check
was added by me when refactoring the x86 syscall. For aarch64 we will
include this header from lib.h but we are restricted by this check.
Just remove it for all archs. User shouldn't touch this code directly
anyway.
Signed-off-by: Ammar Faizi <[email protected]>
---
src/arch/arm64/syscall.h | 4 ----
src/arch/generic/lib.h | 4 ----
src/arch/generic/syscall.h | 4 ----
src/arch/x86/lib.h | 4 ----
src/arch/x86/syscall.h | 4 ----
src/syscall.h | 2 --
6 files changed, 22 deletions(-)
diff --git a/src/arch/arm64/syscall.h b/src/arch/arm64/syscall.h
index 732ada0..69a36a3 100644
--- a/src/arch/arm64/syscall.h
+++ b/src/arch/arm64/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */
-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_ARM64_SYSCALL_H
#define LIBURING_ARCH_ARM64_SYSCALL_H
diff --git a/src/arch/generic/lib.h b/src/arch/generic/lib.h
index 737e795..6b006c6 100644
--- a/src/arch/generic/lib.h
+++ b/src/arch/generic/lib.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */
-#ifndef __INTERNAL__LIBURING_LIB_H
- #error "This file should be included from src/lib.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_GENERIC_LIB_H
#define LIBURING_ARCH_GENERIC_LIB_H
diff --git a/src/arch/generic/syscall.h b/src/arch/generic/syscall.h
index 22252a1..e637890 100644
--- a/src/arch/generic/syscall.h
+++ b/src/arch/generic/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */
-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_GENERIC_SYSCALL_H
#define LIBURING_ARCH_GENERIC_SYSCALL_H
diff --git a/src/arch/x86/lib.h b/src/arch/x86/lib.h
index e6a74f3..6ece2d4 100644
--- a/src/arch/x86/lib.h
+++ b/src/arch/x86/lib.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */
-#ifndef __INTERNAL__LIBURING_LIB_H
- #error "This file should be included from src/lib.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_X86_LIB_H
#define LIBURING_ARCH_X86_LIB_H
diff --git a/src/arch/x86/syscall.h b/src/arch/x86/syscall.h
index 43c576b..cb8fb91 100644
--- a/src/arch/x86/syscall.h
+++ b/src/arch/x86/syscall.h
@@ -1,9 +1,5 @@
/* SPDX-License-Identifier: MIT */
-#ifndef __INTERNAL__LIBURING_SYSCALL_H
- #error "This file should be included from src/syscall.h (liburing)"
-#endif
-
#ifndef LIBURING_ARCH_X86_SYSCALL_H
#define LIBURING_ARCH_X86_SYSCALL_H
diff --git a/src/syscall.h b/src/syscall.h
index 9e72e6f..39a18df 100644
--- a/src/syscall.h
+++ b/src/syscall.h
@@ -70,7 +70,6 @@ static inline bool IS_ERR(const void *ptr)
return uring_unlikely((uintptr_t) ptr >= (uintptr_t) -4095UL);
}
-#define __INTERNAL__LIBURING_SYSCALL_H
#if defined(__x86_64__) || defined(__i386__)
#include "arch/x86/syscall.h"
#elif defined(__aarch64__)
@@ -86,7 +85,6 @@ static inline bool IS_ERR(const void *ptr)
/* libc syscall wrappers. */
#include "arch/generic/syscall.h"
#endif
-#undef __INTERNAL__LIBURING_SYSCALL_H
/*
* For backward compatibility.
--
Ammar Faizi
next prev parent reply other threads:[~2022-06-29 0:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-29 0:27 [PATCH liburing v1 0/9] aarch64 nolibc support Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 1/9] CHANGELOG: Fixup missing space Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 2/9] setup: Handle `get_page_size()` failure (for aarch64 nolibc support) Ammar Faizi
2022-06-29 0:50 ` Alviro Iskandar Setiawan
2022-06-29 1:00 ` Ammar Faizi
2022-06-29 15:00 ` Jens Axboe
2022-06-29 15:17 ` Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 3/9] arch: syscall: Add `__sys_open()` syscall Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 4/9] arch: syscall: Add `__sys_read()` syscall Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 5/9] arch/arm64: Rename aarch64 directory to arm64 Ammar Faizi
2022-06-29 14:48 ` Jens Axboe
2022-06-29 14:51 ` Ammar Faizi
2022-06-29 0:27 ` Ammar Faizi [this message]
2022-06-29 0:27 ` [PATCH liburing v1 7/9] arch/arm64: Add `get_page_size()` function Ammar Faizi
2022-06-29 0:31 ` Ammar Faizi
2022-06-29 14:49 ` Jens Axboe
2022-06-29 14:52 ` Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 8/9] arch: Enable nolibc support for arm64 Ammar Faizi
2022-06-29 0:27 ` [PATCH liburing v1 9/9] .github: Enable aarch64 nolibc build for GitHub bot Ammar Faizi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox