public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/nolibc: move poll() to poll.h

Browse source 
This is the location regular userspace expects the definition.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250430-poll-v1-1-44b5ceabdeee@linutronix.de
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
This commit is contained in:
Thomas Weißschuh 2025-04-30 11:35:32 +02:00 • committed by Thomas Weißschuh
parent 66a4f9bb1e
commit dc2c656e1f
4 changed files with 57 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/include/nolibc/Makefile
View file

@ -36,6 +36,7 @@ all_files := \
getopt.h \
limits.h \
nolibc.h \
poll.h \
signal.h \
stackprotector.h \
std.h \

1
tools/include/nolibc/nolibc.h
View file

@ -114,6 +114,7 @@
#include "dirent.h"
#include "fcntl.h"
#include "getopt.h"
#include "poll.h"
/* Used by programs to avoid std includes */
#define NOLIBC

55
tools/include/nolibc/poll.h Normal file
View file

@ -0,0 +1,55 @@
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
/*
* poll definitions for NOLIBC
* Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>
*/
/* make sure to include all global symbols */
#include "nolibc.h"
#ifndef _NOLIBC_POLL_H
#define _NOLIBC_POLL_H
#include "arch.h"
#include "types.h"
#include "sys.h"
#include <linux/time.h>
/*
* int poll(struct pollfd *fds, int nfds, int timeout);
*/
static __attribute__((unused))
int sys_poll(struct pollfd *fds, int nfds, int timeout)
{
#if defined(__NR_ppoll)
struct timespec t;
if (timeout >= 0) {
t.tv_sec = timeout / 1000;
t.tv_nsec = (timeout % 1000) * 1000000;
}
return my_syscall5(__NR_ppoll, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0);
#elif defined(__NR_ppoll_time64)
struct __kernel_timespec t;
if (timeout >= 0) {
t.tv_sec = timeout / 1000;
t.tv_nsec = (timeout % 1000) * 1000000;
}
return my_syscall5(__NR_ppoll_time64, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0);
#elif defined(__NR_poll)
return my_syscall3(__NR_poll, fds, nfds, timeout);
#else
return __nolibc_enosys(__func__, fds, nfds, timeout);
#endif
}
static __attribute__((unused))
int poll(struct pollfd *fds, int nfds, int timeout)
{
return __sysret(sys_poll(fds, nfds, timeout));
}
#endif /* _NOLIBC_POLL_H */

37
tools/include/nolibc/sys.h
View file

@ -766,43 +766,6 @@ int pivot_root(const char *new, const char *old)
}
/*
* int poll(struct pollfd *fds, int nfds, int timeout);
*/
static __attribute__((unused))
int sys_poll(struct pollfd *fds, int nfds, int timeout)
{
#if defined(__NR_ppoll)
struct timespec t;
if (timeout >= 0) {
t.tv_sec = timeout / 1000;
t.tv_nsec = (timeout % 1000) * 1000000;
}
return my_syscall5(__NR_ppoll, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0);
#elif defined(__NR_ppoll_time64)
struct __kernel_timespec t;
if (timeout >= 0) {
t.tv_sec = timeout / 1000;
t.tv_nsec = (timeout % 1000) * 1000000;
}
return my_syscall5(__NR_ppoll_time64, fds, nfds, (timeout >= 0) ? &t : NULL, NULL, 0);
#elif defined(__NR_poll)
return my_syscall3(__NR_poll, fds, nfds, timeout);
#else
return __nolibc_enosys(__func__, fds, nfds, timeout);
#endif
}
static __attribute__((unused))
int poll(struct pollfd *fds, int nfds, int timeout)
{
return __sysret(sys_poll(fds, nfds, timeout));
}
/*
* ssize_t read(int fd, void *buf, size_t count);
*/