klibc-bot for Ben Hutchings
2023-Feb-12 22:48 UTC
[klibc] [klibc:master] select: Remove support for pselect7() syscall
Commit-ID: 26dded7e0a855dc8d8b80e93a4562ede6f4e3c98
Gitweb:
http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=26dded7e0a855dc8d8b80e93a4562ede6f4e3c98
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: Sun, 12 Feb 2023 22:10:18 +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 | 16 ----------------
2 files changed, 20 deletions(-)
diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def
index 2b23200a..6d01c176 100644
--- a/usr/klibc/SYSCALLS.def
+++ b/usr/klibc/SYSCALLS.def
@@ -166,11 +166,7 @@ int dup3(int, int, int);
int ioctl(int, int, void *);
int flock(int, int);
<?> int _newselect,select::select(int, fd_set *, fd_set *, fd_set *,
struct timeval *);
-#if defined(__NR_pselect7)
-int pselect7::__pselect7(int, fd_set *, fd_set *, fd_set *, struct timespec *,
const sigset_t *, size_t);
-#elif defined(__NR_pselect6)
int pselect6::__pselect6(int, fd_set *, fd_set *, fd_set *, struct timespec *,
const struct __pselect6 *);
-#endif
<?> int poll(struct pollfd *, nfds_t, long);
<?> int ppoll::__ppoll(struct pollfd *, nfds_t, struct timespec *, const
sigset_t *, size_t);
int fsync(int);
diff --git a/usr/klibc/pselect.c b/usr/klibc/pselect.c
index f118c19b..42777f92 100644
--- a/usr/klibc/pselect.c
+++ b/usr/klibc/pselect.c
@@ -5,20 +5,6 @@
#include <sys/select.h>
#include <sys/syscall.h>
-#if 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)
-
struct __pselect6 {
const sigset_t *sigmask;
size_t sigsize;
@@ -34,5 +20,3 @@ int pselect(int n, fd_set * readfds, fd_set * writefds, fd_set
* exceptfds,
return __pselect6(n, readfds, writefds, exceptfds,
timeout, &extended_sigmask);
}
-
-#endif