diff options
| author | davidxu <davidxu@FreeBSD.org> | 2004-12-25 13:02:50 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2004-12-25 13:02:50 +0000 |
| commit | 9476ffbed8df3ebc72f2548f9db81306e46e27e5 (patch) | |
| tree | 2eeba36fb1ca4e8e0a8e9c76f7a214b11c07a3a2 /sys/kern | |
| parent | 7b03c7ecc4225f3c91f0ca8226a08c5f578c1baa (diff) | |
| download | FreeBSD-src-9476ffbed8df3ebc72f2548f9db81306e46e27e5.zip FreeBSD-src-9476ffbed8df3ebc72f2548f9db81306e46e27e5.tar.gz | |
Make _umtx_op() as more general interface, the final parameter needn't be
timespec pointer, every parameter will be interpreted by its opcode.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/init_sysent.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_umtx.c | 8 | ||||
| -rw-r--r-- | sys/kern/syscalls.c | 2 | ||||
| -rw-r--r-- | sys/kern/syscalls.master | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 5ebbec8..873f70f 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.180 2004/11/25 12:07:28 phk Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp */ #include "opt_compat.h" diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index e00b9a6..e0502b8 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -736,10 +736,10 @@ _umtx_op(struct thread *td, struct _umtx_op_args *uap) switch(uap->op) { case UMTX_OP_LOCK: /* Allow a null timespec (wait forever). */ - if (uap->abstime == NULL) + if (uap->uaddr2 == NULL) ts = NULL; else { - error = copyin(uap->abstime, &abstime, sizeof(abstime)); + error = copyin(uap->uaddr2, &abstime, sizeof(abstime)); if (error != 0) return (error); if (abstime.tv_nsec >= 1000000000 || @@ -752,10 +752,10 @@ _umtx_op(struct thread *td, struct _umtx_op_args *uap) return do_unlock(td, uap->umtx, uap->id); case UMTX_OP_UNLOCK_AND_WAIT: /* Allow a null timespec (wait forever). */ - if (uap->abstime == NULL) + if (uap->uaddr2 == NULL) ts = NULL; else { - error = copyin(uap->abstime, &abstime, sizeof(abstime)); + error = copyin(uap->uaddr2, &abstime, sizeof(abstime)); if (error != 0) return (error); if (abstime.tv_nsec >= 1000000000 || diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index e61b71e..97306a3 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.180 2004/11/25 12:07:28 phk Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.181 2004/12/18 12:52:44 davidxu Exp */ const char *syscallnames[] = { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 14eb54d..76d4a06 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -644,6 +644,6 @@ *auditinfo_addr, u_int length); } 453 MNOSTD { int auditctl(int cmd, char *path); } 454 MSTD { int _umtx_op(struct umtx *umtx, int op, long id, void *uaddr,\ - struct timespec *abstime); } + void *uaddr2); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master |
