Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/nolibc: remove more __nolibc_enosys() fallbacks

Commit e6366101ce1f ("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: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>

+4 -12
+4 -12
tools/include/nolibc/time.h
··· 89 89 { 90 90 #if defined(__NR_clock_settime) 91 91 return my_syscall2(__NR_clock_settime, clockid, tp); 92 - #elif defined(__NR_clock_settime64) 92 + #else 93 93 struct __kernel_timespec ktp; 94 94 95 95 __nolibc_timespec_user_to_kernel(tp, &ktp); 96 96 return my_syscall2(__NR_clock_settime64, clockid, &ktp); 97 - #else 98 - return __nolibc_enosys(__func__, clockid, tp); 99 97 #endif 100 98 } 101 99 ··· 109 111 { 110 112 #if defined(__NR_clock_nanosleep) 111 113 return my_syscall4(__NR_clock_nanosleep, clockid, flags, rqtp, rmtp); 112 - #elif defined(__NR_clock_nanosleep_time64) 114 + #else 113 115 struct __kernel_timespec krqtp, krmtp; 114 116 int ret; 115 117 ··· 118 120 if (rmtp) 119 121 __nolibc_timespec_kernel_to_user(&krmtp, rmtp); 120 122 return ret; 121 - #else 122 - return __nolibc_enosys(__func__, clockid, flags, rqtp, rmtp); 123 123 #endif 124 124 } 125 125 ··· 191 195 { 192 196 #if defined(__NR_timer_gettime) 193 197 return my_syscall2(__NR_timer_gettime, timerid, curr_value); 194 - #elif defined(__NR_timer_gettime64) 198 + #else 195 199 struct __kernel_itimerspec kcurr_value; 196 200 int ret; 197 201 ··· 199 203 __nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->it_interval); 200 204 __nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_value); 201 205 return ret; 202 - #else 203 - return __nolibc_enosys(__func__, timerid, curr_value); 204 206 #endif 205 207 } 206 208 ··· 214 220 { 215 221 #if defined(__NR_timer_settime) 216 222 return my_syscall4(__NR_timer_settime, timerid, flags, new_value, old_value); 217 - #elif defined(__NR_timer_settime64) 223 + #else 218 224 struct __kernel_itimerspec knew_value, kold_value; 219 225 int ret; 220 226 ··· 226 232 __nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value); 227 233 } 228 234 return ret; 229 - #else 230 - return __nolibc_enosys(__func__, timerid, flags, new_value, old_value); 231 235 #endif 232 236 } 233 237