Skip to content

Commit 31b4d3a

Browse files
committed
tools/nolibc: remove more __nolibc_enosys() fallbacks
Commit e636610 ("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>
1 parent 3e1da54 commit 31b4d3a

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

tools/include/nolibc/time.h

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,11 @@ int sys_clock_settime(clockid_t clockid, struct timespec *tp)
8989
{
9090
#if defined(__NR_clock_settime)
9191
return my_syscall2(__NR_clock_settime, clockid, tp);
92-
#elif defined(__NR_clock_settime64)
92+
#else
9393
struct __kernel_timespec ktp;
9494

9595
__nolibc_timespec_user_to_kernel(tp, &ktp);
9696
return my_syscall2(__NR_clock_settime64, clockid, &ktp);
97-
#else
98-
return __nolibc_enosys(__func__, clockid, tp);
9997
#endif
10098
}
10199

@@ -111,7 +109,7 @@ int sys_clock_nanosleep(clockid_t clockid, int flags, const struct timespec *rqt
111109
{
112110
#if defined(__NR_clock_nanosleep)
113111
return my_syscall4(__NR_clock_nanosleep, clockid, flags, rqtp, rmtp);
114-
#elif defined(__NR_clock_nanosleep_time64)
112+
#else
115113
struct __kernel_timespec krqtp, krmtp;
116114
int ret;
117115

@@ -120,8 +118,6 @@ int sys_clock_nanosleep(clockid_t clockid, int flags, const struct timespec *rqt
120118
if (rmtp)
121119
__nolibc_timespec_kernel_to_user(&krmtp, rmtp);
122120
return ret;
123-
#else
124-
return __nolibc_enosys(__func__, clockid, flags, rqtp, rmtp);
125121
#endif
126122
}
127123

@@ -195,16 +191,14 @@ int sys_timer_gettime(timer_t timerid, struct itimerspec *curr_value)
195191
{
196192
#if defined(__NR_timer_gettime)
197193
return my_syscall2(__NR_timer_gettime, timerid, curr_value);
198-
#elif defined(__NR_timer_gettime64)
194+
#else
199195
struct __kernel_itimerspec kcurr_value;
200196
int ret;
201197

202198
ret = my_syscall2(__NR_timer_gettime64, timerid, &kcurr_value);
203199
__nolibc_timespec_kernel_to_user(&kcurr_value.it_interval, &curr_value->it_interval);
204200
__nolibc_timespec_kernel_to_user(&kcurr_value.it_value, &curr_value->it_value);
205201
return ret;
206-
#else
207-
return __nolibc_enosys(__func__, timerid, curr_value);
208202
#endif
209203
}
210204

@@ -220,7 +214,7 @@ int sys_timer_settime(timer_t timerid, int flags,
220214
{
221215
#if defined(__NR_timer_settime)
222216
return my_syscall4(__NR_timer_settime, timerid, flags, new_value, old_value);
223-
#elif defined(__NR_timer_settime64)
217+
#else
224218
struct __kernel_itimerspec knew_value, kold_value;
225219
int ret;
226220

@@ -232,8 +226,6 @@ int sys_timer_settime(timer_t timerid, int flags,
232226
__nolibc_timespec_kernel_to_user(&kold_value.it_value, &old_value->it_value);
233227
}
234228
return ret;
235-
#else
236-
return __nolibc_enosys(__func__, timerid, flags, new_value, old_value);
237229
#endif
238230
}
239231

0 commit comments

Comments
 (0)