Commit 5b1c827c authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney
Browse files

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: 66b6f755 ("rcutorture: Import a copy of nolibc")
Tested-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64]
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent be60ca41

tools/include/nolibc/nolibc.h

+10 −0
Original line number Diff line number Diff line
@@ -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))