diff options
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/bsdos/syscalls.master | 4 | ||||
| -rw-r--r-- | sys/compat/freebsd/freebsd_misc.c | 25 | ||||
| -rw-r--r-- | sys/compat/freebsd/syscalls.master | 4 | ||||
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 23 | ||||
| -rw-r--r-- | sys/compat/linux/syscalls.master | 4 | ||||
| -rw-r--r-- | sys/compat/sunos/sunos_misc.c | 19 | ||||
| -rw-r--r-- | sys/compat/sunos/syscalls.master | 4 |
7 files changed, 11 insertions, 72 deletions
diff --git a/sys/compat/bsdos/syscalls.master b/sys/compat/bsdos/syscalls.master index 3e0a4a84474..09d51e08eed 100644 --- a/sys/compat/bsdos/syscalls.master +++ b/sys/compat/bsdos/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.2 1997/09/03 13:20:55 downsj Exp $ + $OpenBSD: syscalls.master,v 1.3 1997/11/13 18:35:21 deraadt Exp $ ; OpenBSD COMPAT_BSDOS system call name/number "master" file. ; (See syscalls.conf to see what it is processed into.) @@ -131,7 +131,7 @@ 63 NOARGS { int compat_43_sys_getkerninfo(int op, char *where, \ int *size, int arg); } ogetkerninfo 64 NOARGS { int compat_43_sys_getpagesize(void); } ogetpagesize -65 NOARGS { int sys_msync(caddr_t addr, size_t len, int flags); } +65 NOARGS { int sys_msync(void *addr, size_t len, int flags); } 66 NOARGS { int sys_vfork(void); } 67 OBSOL vread 68 OBSOL vwrite diff --git a/sys/compat/freebsd/freebsd_misc.c b/sys/compat/freebsd/freebsd_misc.c index a89018fcad1..fbf4c0d9414 100644 --- a/sys/compat/freebsd/freebsd_misc.c +++ b/sys/compat/freebsd/freebsd_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: freebsd_misc.c,v 1.4 1997/11/13 07:35:38 deraadt Exp $ */ +/* $OpenBSD: freebsd_misc.c,v 1.5 1997/11/13 18:35:24 deraadt Exp $ */ /* $NetBSD: freebsd_misc.c,v 1.2 1996/05/03 17:03:10 christos Exp $ */ /* @@ -48,29 +48,6 @@ #include <compat/freebsd/freebsd_rtprio.h> #include <compat/freebsd/freebsd_timex.h> -int -freebsd_sys_msync(p, v, retval) - struct proc *p; - void *v; - register_t *retval; -{ - struct freebsd_sys_msync_args /* { - syscallarg(caddr_t) addr; - syscallarg(size_t) len; - syscallarg(int) flags; - } */ *uap = v; - struct sys_msync_args bma; - - /* - * FreeBSD-2.0-RELEASE's msync(2) is compatible with NetBSD's. - * FreeBSD-2.0.5-RELEASE's msync(2) has addtional argument `flags', - * but syscall number is not changed. :-< - */ - SCARG(&bma, addr) = SCARG(uap, addr); - SCARG(&bma, len) = SCARG(uap, len); - return sys_msync(p, &bma, retval); /* XXX - simply ignores `flags' */ -} - /* just a place holder */ int diff --git a/sys/compat/freebsd/syscalls.master b/sys/compat/freebsd/syscalls.master index 8e06d188bdd..1b3e5f23e34 100644 --- a/sys/compat/freebsd/syscalls.master +++ b/sys/compat/freebsd/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.7 1997/11/13 07:35:38 deraadt Exp $ + $OpenBSD: syscalls.master,v 1.8 1997/11/13 18:35:23 deraadt Exp $ ; $NetBSD: syscalls.master,v 1.3 1995/10/10 18:28:40 mycroft Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -140,7 +140,7 @@ 63 NOARGS { int compat_43_sys_getkerninfo(int op, char *where, \ int *size, int arg); } ogetkerninfo 64 NOARGS { int compat_43_sys_getpagesize(void); } ogetpagesize -65 STD { int freebsd_sys_msync(caddr_t addr, size_t len, \ +65 NOARGS { int sys_msync(void *addr, size_t len, \ int flags); } 66 NOARGS { int sys_vfork(void); } 67 OBSOL vread diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index bace5aa9cd3..83bae49e180 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_misc.c,v 1.11 1997/11/13 06:37:49 deraadt Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.12 1997/11/13 18:35:26 deraadt Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /* @@ -529,27 +529,6 @@ linux_sys_mremap(p, v, retval) return (ENOMEM); } -int -linux_sys_msync(p, v, retval) - struct proc *p; - void *v; - register_t *retval; -{ - struct linux_sys_msync_args /* { - syscallarg(caddr_t) addr; - syscallarg(int) len; - syscallarg(int) fl; - } */ *uap = v; - - struct sys_msync_args bma; - - /* flags are ignored */ - SCARG(&bma, addr) = SCARG(uap, addr); - SCARG(&bma, len) = SCARG(uap, len); - - return sys_msync(p, &bma, retval); -} - /* * This code is partly stolen from src/lib/libc/compat-43/times.c * XXX - CLK_TCK isn't declared in /sys, just in <time.h>, done here diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master index d180fb8ae1f..fb52401620d 100644 --- a/sys/compat/linux/syscalls.master +++ b/sys/compat/linux/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.11 1997/07/28 10:21:31 deraadt Exp $ + $OpenBSD: syscalls.master,v 1.12 1997/11/13 18:35:27 deraadt Exp $ ; $NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -235,7 +235,7 @@ fd_set *writefds, fd_set *exceptfds, \ struct timeval *timeout); } 143 NOARGS { int sys_flock(int fd, int how); } -144 STD { int linux_sys_msync(caddr_t addr, int len, int fl); } +144 NOARGS { int sys_msync(void *addr, int len, int fl); } 145 NOARGS { int sys_readv(int fd, struct iovec *iovp, \ u_int iovcnt); } 146 NOARGS { int sys_writev(int fd, struct iovec *iovp, \ diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index b092f7e5781..fabf8a01055 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunos_misc.c,v 1.15 1997/11/06 22:15:51 millert Exp $ */ +/* $OpenBSD: sunos_misc.c,v 1.16 1997/11/13 18:35:28 deraadt Exp $ */ /* $NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $ */ /* @@ -220,23 +220,6 @@ sunos_sys_execv(p, v, retval) } int -sunos_sys_omsync(p, v, retval) - struct proc *p; - void *v; - register_t *retval; -{ - struct sunos_sys_omsync_args *uap = v; - struct sys_msync_args ouap; - - if (SCARG(uap, flags)) - return (EINVAL); - SCARG(&ouap, addr) = SCARG(uap, addr); - SCARG(&ouap, len) = SCARG(uap, len); - - return (sys_msync(p, &ouap, retval)); -} - -int sunos_sys_unmount(p, v, retval) struct proc *p; void *v; diff --git a/sys/compat/sunos/syscalls.master b/sys/compat/sunos/syscalls.master index 5f36e6d009b..2eb3d5c6d35 100644 --- a/sys/compat/sunos/syscalls.master +++ b/sys/compat/sunos/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.7 1997/07/28 09:53:13 deraadt Exp $ + $OpenBSD: syscalls.master,v 1.8 1997/11/13 18:35:29 deraadt Exp $ ; $NetBSD: syscalls.master,v 1.33 1996/02/28 16:05:43 pk Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -113,7 +113,7 @@ 62 NOARGS { int compat_43_sys_fstat(int fd, struct ostat *sb); } 63 UNIMPL 64 NOARGS { int compat_43_sys_getpagesize(void); } -65 STD { int sunos_sys_omsync(caddr_t addr, size_t len, \ +65 NOARGS { int sys_msync(void *addr, size_t len, \ int flags); } 66 NOARGS { int sys_vfork(void); } 67 OBSOL vread |