summaryrefslogtreecommitdiffstats
path: root/sys/compat/linux/linux_futex.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2013-10-25 04:51:38 +0000
committerguenther <guenther@openbsd.org>2013-10-25 04:51:38 +0000
commit086a9a62da816c7a4a5ad1ce34e32ee5963280f5 (patch)
treedf3f53e1f9847ab9e9c25fc5d590f7df6dde817e /sys/compat/linux/linux_futex.c
parentMove the declarations for dogetrusage(), itimerround(), and dowait4() (diff)
downloadwireguard-openbsd-086a9a62da816c7a4a5ad1ce34e32ee5963280f5.tar.xz
wireguard-openbsd-086a9a62da816c7a4a5ad1ce34e32ee5963280f5.zip
Start to deal with the time_t change's effect on compat/linux:
- add Linux versions of struct rusage, timeval, and itimerval and conversion functions for them - add Linux versions of getrusage(), gettimeofday(), {set,get}itimer(), and nanosleep() - fix various inconsistencies in naming of Linux versions of types and conversion functions - add mappings for LINUX_CLOCK_{PROCESS,THREAD}_CPUTIME_ID to the native versions Originally written months ago as part of the time_t work; long memory, prodding, and ok from pirofti@
Diffstat (limited to 'sys/compat/linux/linux_futex.c')
-rw-r--r--sys/compat/linux/linux_futex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 31fabdadba4..8b92876d083 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_futex.c,v 1.14 2013/04/10 13:17:41 pirofti Exp $ */
+/* $OpenBSD: linux_futex.c,v 1.15 2013/10/25 04:51:38 guenther Exp $ */
/* $NetBSD: linux_futex.c,v 1.26 2010/07/07 01:30:35 chs Exp $ */
/*-
@@ -118,7 +118,7 @@ linux_sys_futex(struct proc *p, void *v, register_t *retval)
syscallarg(int) val3;
} */ *uap = v;
- struct l_timespec lts;
+ struct linux_timespec lts;
struct timespec ts = {0, 0};
int error;
@@ -128,7 +128,7 @@ linux_sys_futex(struct proc *p, void *v, register_t *retval)
&lts, sizeof(lts))) != 0) {
return error;
}
- linux_to_native_timespec(&ts, &lts);
+ linux_to_bsd_timespec(&ts, &lts);
}
return linux_do_futex(p, uap, retval, &ts);