diff options
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/common/compat_vm.c | 55 | ||||
| -rw-r--r-- | sys/compat/linux/files.linux | 3 | ||||
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 17 | ||||
| -rw-r--r-- | sys/compat/linux/syscalls.master | 4 |
4 files changed, 20 insertions, 59 deletions
diff --git a/sys/compat/common/compat_vm.c b/sys/compat/common/compat_vm.c deleted file mode 100644 index 8b8c93bc732..00000000000 --- a/sys/compat/common/compat_vm.c +++ /dev/null @@ -1,55 +0,0 @@ -/* $OpenBSD: compat_vm.c,v 1.5 2007/11/28 13:10:28 deraadt Exp $ */ -/* $NetBSD: vm_12.c,v 1.8 1997/10/20 22:05:22 thorpej Exp $ */ - -/* - * Copyright (c) 1997 Matthew R. Green - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/mount.h> /* needed for next include! */ -#include <sys/syscallargs.h> - -#include <sys/swap.h> -#include <sys/mman.h> - -int -compat_25_sys_swapon(p, v, retval) - struct proc *p; - void *v; - register_t *retval; -{ - struct sys_swapctl_args ua; - struct compat_25_sys_swapon_args /* { - syscallarg(const char *) name; - } */ *uap = v; - - SCARG(&ua, cmd) = SWAP_ON; - SCARG(&ua, arg) = (void *)SCARG(uap, name); - SCARG(&ua, misc) = 0; /* priority */ - return (sys_swapctl(p, &ua, retval)); -} diff --git a/sys/compat/linux/files.linux b/sys/compat/linux/files.linux index d6c32a7fdef..7db4fc73557 100644 --- a/sys/compat/linux/files.linux +++ b/sys/compat/linux/files.linux @@ -1,4 +1,4 @@ -# $OpenBSD: files.linux,v 1.15 2011/02/10 11:58:43 pirofti Exp $ +# $OpenBSD: files.linux,v 1.16 2011/07/09 00:10:52 deraadt Exp $ # $NetBSD: files.linux,v 1.4 1996/03/08 04:55:59 mycroft Exp $ # # Config.new file description for machine-independent Linux compat code. @@ -28,3 +28,4 @@ file compat/linux/linux_sysent.c compat_linux file compat/linux/linux_termios.c compat_linux file compat/linux/linux_time.c compat_linux file compat/linux/linux_dummy.c compat_linux + diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 0b62285fa8c..57020d126fa 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.71 2011/07/08 19:19:20 tedu Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.72 2011/07/09 00:10:52 deraadt Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /*- @@ -51,6 +51,7 @@ #include <sys/mount.h> #include <sys/ptrace.h> #include <sys/resource.h> +#include <sys/swap.h> #include <sys/resourcevar.h> #include <sys/signal.h> #include <sys/signalvar.h> @@ -1466,3 +1467,17 @@ linux_sys_setdomainname(struct proc *p, void *v, register_t *retval) return (kern_sysctl(mib, 1, NULL, NULL, SCARG(uap, name), SCARG(uap, len), p)); } + +int +linux_sys_swapon(struct proc *p, void *v, register_t *retval) +{ + struct sys_swapctl_args ua; + struct linux_sys_swapon_args /* { + syscallarg(const char *) name; + } */ *uap = v; + + SCARG(&ua, cmd) = SWAP_ON; + SCARG(&ua, arg) = (void *)SCARG(uap, name); + SCARG(&ua, misc) = 0; /* priority */ + return (sys_swapctl(p, &ua, retval)); +} diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master index 1682314d652..c70f97cf30c 100644 --- a/sys/compat/linux/syscalls.master +++ b/sys/compat/linux/syscalls.master @@ -1,4 +1,4 @@ - $OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp $ + $OpenBSD: syscalls.master,v 1.60 2011/07/09 00:10:52 deraadt Exp $ ; $NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -159,7 +159,7 @@ 85 STD { int linux_sys_readlink(char *name, char *buf, \ int count); } 86 STD { int linux_sys_uselib(char *path); } -87 NOARGS { int compat_25_sys_swapon(char *name); } +87 STD { int linux_sys_swapon(char *name); } 88 NOARGS { int sys_reboot(int opt); } 89 STD { int linux_sys_readdir(int fd, caddr_t dent, \ unsigned int count); } |