diff options
| author |   Willy Tarreau <w@1wt.eu> | 2021-01-21 08:20:27 +0100 |
|---|---|---|
| committer |   Paul E. McKenney <paulmck@kernel.org> | 2021-01-21 10:06:44 -0800 |
| commit | 5b1c827ca3b349801e2faff4185118cfa74f94c6 (patch) | |
| tree | b43a7962b05c86870788308576297d5b8a85c92f /tools/include/nolibc/nolibc.h | |
| parent | tools/nolibc: Implement fork() based on clone() (diff) | |
| download | linux-stable-5b1c827ca3b349801e2faff4185118cfa74f94c6.tar.xz linux-stable-5b1c827ca3b349801e2faff4185118cfa74f94c6.zip | |
tools/nolibc: Implement poll() based on ppoll()
Some architectures like arm64 do not implement poll() and have to use
ppoll() instead. This commit therefore makes poll() use ppoll() when
available. This is a port of nolibc's upstream commit 800f75c13ede to
the Linux kernel.
Fixes: 66b6f755ad45 ("rcutorture: Import a copy of nolibc")
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64]
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/include/nolibc/nolibc.h')
| -rw-r--r-- | tools/include/nolibc/nolibc.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h index fdd5524e0e54..833693faf53c 100644 --- a/tools/include/nolibc/nolibc.h +++ b/tools/include/nolibc/nolibc.h @@ -1652,7 +1652,17 @@ int sys_pivot_root(const char *new, const char *old) 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_syscall4(__NR_ppoll, fds, nfds, (timeout >= 0) ? &t : NULL, NULL); +#else return my_syscall3(__NR_poll, fds, nfds, timeout); +#endif } static __attribute__((unused)) |