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

tools/nolibc: remove more __nolibc_enosys() fallbacks 



Commit e6366101 ("tools/nolibc: remove __nolibc_enosys() fallback
from time64-related functions") removed many of these fallbacks but
forgot a few.

Finish the job.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
parent 3e1da545

tools/include/nolibc/time.h

+4 −12
Original line number Diff line number Diff line
@@ -89,13 +89,11 @@ int sys_clock_settime(clockid_t clockid, struct timespec *tp) 
{

#if defined(__NR_clock_settime)

	return my_syscall2(__NR_clock_settime, clockid, tp);

#elif defined(__NR_clock_settime64)

#else

	struct __kernel_timespec ktp;



	__nolibc_timespec_user_to_kernel(tp, &ktp);

	return my_syscall2(__NR_clock_settime64, clockid, &ktp);

#else

	return __nolibc_enosys(__func__, clockid, tp);

#endif

}
@@ -111,7 +109,7 @@ int sys_clock_nanosleep(clockid_t clockid, int flags, const struct timespec *rqt 
{

#if defined(__NR_clock_nanosleep)

	return my_syscall4(__NR_clock_nanosleep, clockid, flags, rqtp, rmtp);

#elif defined(__NR_clock_nanosleep_time64)

#else

	struct __kernel_timespec krqtp, krmtp;

	int ret;
@@ -120,8 +118,6 @@ int sys_clock_nanosleep(clockid_t clockid, int flags, const struct timespec *rqt 
	if (rmtp)

		__nolibc_timespec_kernel_to_user(&krmtp, rmtp);

	return ret;

#else

	return __nolibc_enosys(__func__, clockid, flags, rqtp, rmtp);

#endif

}
@@ -195,7 +191,7 @@ int sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value) 
{

#if defined(__NR_timer_gettime)

	return my_syscall2(__NR_timer_gettime, timerid, curr_value);

#elif defined(__NR_timer_gettime64)

#else

	struct __kernel_itimerspec kcurr_value;

	int ret;
@@ -203,8 +199,6 @@ int sys_timer_gettime(timer_t timerid, 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__, timerid, curr_value);

#endif

}
@@ -220,7 +214,7 @@ int sys_timer_settime(timer_t timerid, int flags, 
{

#if defined(__NR_timer_settime)

	return my_syscall4(__NR_timer_settime, timerid, flags, new_value, old_value);

#elif defined(__NR_timer_settime64)

#else

	struct __kernel_itimerspec knew_value, kold_value;

	int ret;
@@ -232,8 +226,6 @@ int sys_timer_settime(timer_t timerid, int flags, 
		__nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value);

	}

	return ret;

#else

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

#endif

}