d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete the duplicate of linux_to_native_clockid() function.

Browse Source 
Differential Revision:	https://reviews.freebsd.org/D1521
Reviewed by:	trasz
This commit is contained in:
Dmitry Chagin 2015-05-24 17:30:31 +00:00
parent 680982281b
commit 16ac71bc4f
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/compat/linux/linux_time.c
View File

@ -119,8 +119,6 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_flags, "int");
LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int");
LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int");
static int linux_to_native_clockid(clockid_t *, clockid_t);
void
native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp)
@ -151,7 +149,7 @@ linux_to_native_timespec(struct timespec *ntp, struct l_timespec *ltp)
return (0);
}
static int
int
linux_to_native_clockid(clockid_t *n, clockid_t l)
{

23
sys/compat/linux/linux_timer.c
View File

@ -49,23 +49,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <compat/linux/linux_timer.h>
static int
linux_convert_l_clockid(clockid_t *clock_id)
{
switch (*clock_id) {
case LINUX_CLOCK_REALTIME:
*clock_id = CLOCK_REALTIME;
break;
case LINUX_CLOCK_MONOTONIC:
*clock_id = CLOCK_MONOTONIC;
break;
default:
return (EINVAL);
}
return (0);
}
static int
linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
@ -106,6 +89,7 @@ linux_timer_create(struct thread *td, struct linux_timer_create_args *uap)
{
struct l_sigevent l_ev;
struct sigevent ev, *evp;
clockid_t nwhich;
int error, id;
if (uap->evp == NULL) {
@ -119,10 +103,10 @@ linux_timer_create(struct thread *td, struct linux_timer_create_args *uap)
return (error);
evp = &ev;
}
error = linux_convert_l_clockid(&uap->clock_id);
error = linux_to_native_clockid(&nwhich, uap->clock_id);
if (error != 0)
return (error);
error = kern_ktimer_create(td, uap->clock_id, evp, &id, -1);
error = kern_ktimer_create(td, nwhich, evp, &id, -1);
if (error == 0) {
error = copyout(&id, uap->timerid, sizeof(int));
if (error != 0)
@ -179,4 +163,3 @@ linux_timer_delete(struct thread *td, struct linux_timer_delete_args *uap)
return (kern_ktimer_delete(td, uap->timerid));
}

1
sys/compat/linux/linux_timer.h
View File

@ -115,5 +115,6 @@ void native_to_linux_timespec(struct l_timespec *,
struct timespec *);
int linux_to_native_timespec(struct timespec *,
struct l_timespec *);
int linux_to_native_clockid(clockid_t *, clockid_t);
#endif /* _LINUX_TIMER_H */