Commit e6366101 authored by Thomas Weißschuh's avatar Thomas Weißschuh
Browse files

tools/nolibc: remove __nolibc_enosys() fallback from time64-related functions 



These fallbacks where added when no explicit fallbacks for time64 was
implemented. Now that these fallbacks are in place, the additional
fallback to __nolibc_enosys() is superfluous.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250821-nolibc-enosys-v1-1-4b63f2caaa89@weissschuh.net
parent b22d81ed

tools/include/nolibc/poll.h

+1 −3
Original line number Diff line number Diff line
@@ -39,10 +39,8 @@ int sys_poll(struct pollfd *fds, int nfds, int timeout) 
		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);

	return my_syscall3(__NR_poll, fds, nfds, timeout);

#endif

}

tools/include/nolibc/sys.h

+1 −3
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeva 
		t.tv_nsec = timeout->tv_usec * 1000;

	}

	return my_syscall6(__NR_pselect6, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL);

#elif defined(__NR_pselect6_time64)

#else

	struct __kernel_timespec t;



	if (timeout) {
@@ -822,8 +822,6 @@ int sys_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeva 
		t.tv_nsec = timeout->tv_usec * 1000;

	}

	return my_syscall6(__NR_pselect6_time64, nfds, rfds, wfds, efds, timeout ? &t : NULL, NULL);

#else

	return __nolibc_enosys(__func__, nfds, rfds, wfds, efds, timeout);

#endif

}

tools/include/nolibc/sys/timerfd.h

+2 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int sys_timerfd_gettime(int fd, struct itimerspec *curr_value) 
{

#if defined(__NR_timerfd_gettime)

	return my_syscall2(__NR_timerfd_gettime, fd, curr_value);

#elif defined(__NR_timerfd_gettime64)

#else

	struct __kernel_itimerspec kcurr_value;

	int ret;
@@ -42,8 +42,6 @@ int sys_timerfd_gettime(int fd, struct itimerspec *curr_value) 
	__nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->it_interval);

	__nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_value);

	return ret;

#else

	return __nolibc_enosys(__func__, fd, curr_value);

#endif

}
@@ -60,7 +58,7 @@ int sys_timerfd_settime(int fd, int flags, 
{

#if defined(__NR_timerfd_settime)

	return my_syscall4(__NR_timerfd_settime, fd, flags, new_value, old_value);

#elif defined(__NR_timerfd_settime64)

#else

	struct __kernel_itimerspec knew_value, kold_value;

	int ret;
@@ -72,8 +70,6 @@ int sys_timerfd_settime(int fd, int flags, 
		__nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value);

	}

	return ret;

#else

	return __nolibc_enosys(__func__, fd, flags, new_value, old_value);

#endif

}

tools/include/nolibc/time.h

+2 −6
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int sys_clock_getres(clockid_t clockid, struct timespec *res) 
{

#if defined(__NR_clock_getres)

	return my_syscall2(__NR_clock_getres, clockid, res);

#elif defined(__NR_clock_getres_time64)

#else

	struct __kernel_timespec kres;

	int ret;
@@ -53,8 +53,6 @@ int sys_clock_getres(clockid_t clockid, struct timespec *res) 
	if (res)

		__nolibc_timespec_kernel_to_user(&kres, res);

	return ret;

#else

	return __nolibc_enosys(__func__, clockid, res);

#endif

}
@@ -69,7 +67,7 @@ int sys_clock_gettime(clockid_t clockid, struct timespec *tp) 
{

#if defined(__NR_clock_gettime)

	return my_syscall2(__NR_clock_gettime, clockid, tp);

#elif defined(__NR_clock_gettime64)

#else

	struct __kernel_timespec ktp;

	int ret;
@@ -77,8 +75,6 @@ int sys_clock_gettime(clockid_t clockid, struct timespec *tp) 
	if (tp)

		__nolibc_timespec_kernel_to_user(&ktp, tp);

	return ret;

#else

	return __nolibc_enosys(__func__, clockid, tp);

#endif

}