klibc-bot for Ben Hutchings
2023-Jan-14 22:03 UTC
[klibc] [klibc:time64] select: Remove support for pselect7() syscall
Commit-ID: d817e706f1bdc4cd88d85f94121a6a2aa62b0830
Gitweb:
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=d817e706f1bdc4cd88d85f94121a6a2aa62b0830
Author: Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Fri, 13 Jan 2023 23:56:47 +0100
Committer: Ben Hutchings <ben at decadent.org.uk>
CommitDate: Sat, 14 Jan 2023 18:10:12 +0100
[klibc] select: Remove support for pselect7() syscall
pselect7() doesn't seem to have been implemented by any architecture
in the upstream kernel.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/klibc/SYSCALLS.def | 4 +---
usr/klibc/pselect.c | 14 +-------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
index 50e67aa9..ac68cbbb 100644
--- a/usr/klibc/SYSCALLS.def
+++ b/usr/klibc/SYSCALLS.def
@@ -168,9 +168,7 @@ int flock(int, int);
<?> int _newselect,select::select(int, fd_set *, fd_set *, fd_set *,
struct timeval *);
#if defined(__NR_pselect) && !_KLIBC_USE_RT_SIG
int pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const
sigset_t *);
-#elif defined(__NR_pselect7)
-int pselect7::__pselect7(int, fd_set *, fd_set *, fd_set *, struct timespec *,
const sigset_t *, size_t);
-#elif defined(__NR_pselect6)
+#else
int pselect6::__pselect6(int, fd_set *, fd_set *, fd_set *, struct timespec *,
const struct __pselect6 *);
#endif
<?> int poll(struct pollfd *, nfds_t, long);
diff --git a/usr/klibc/pselect.c b/usr/klibc/pselect.c
index 1bb6852d..4a5a9867 100644
--- a/usr/klibc/pselect.c
+++ b/usr/klibc/pselect.c
@@ -9,19 +9,7 @@
/* Don't need to do anything here; use syscall stub directly */
-#elif defined(__NR_pselect7)
-
-__extern int __pselect7(int, fd_set *, fd_set *, fd_set *,
- const struct timespec *, const sigset_t *, size_t);
-
-int pselect(int n, fd_set * readfds, fd_set * writefds, fd_set * exceptfds,
- const struct timespec *timeout, const sigset_t * sigmask)
-{
- return __pselect7(n, readfds, writefds, exceptfds,
- timeout, sigmask, sizeof *sigmask);
-}
-
-#elif defined(__NR_pselect6)
+#else
struct __pselect6 {
const sigset_t *sigmask;