Remove COMPAT_25. The one piece moved by COMPAT_LINUX moves there.

ok guenther

7 files changed, 31 insertions, 74 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); }
diff --git a/sys/conf/files b/sys/conf/files
index 8d14b0deff3..df3e6017b2d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.523 2011/07/08 19:19:20 tedu Exp $
+#	$OpenBSD: files,v 1.524 2011/07/09 00:10:52 deraadt Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -1051,7 +1051,6 @@ file net/pfkeyv2_convert.c		key | ipsec | tcp_signature
 file compat/common/compat_exec.c	!small_kernel
 file compat/common/compat_util.c	!small_kernel
 file compat/common/compat_dir.c		!small_kernel
-file compat/common/compat_vm.c		!small_kernel & compat_linux
 file compat/common/tty_43.c		compat_43
 
 # libx86emu
diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf
index 9a863c89008..577afe4bbe7 100644
--- a/sys/kern/syscalls.conf
+++ b/sys/kern/syscalls.conf
@@ -1,11 +1,11 @@
-#	$OpenBSD: syscalls.conf,v 1.11 2011/07/08 19:21:27 tedu Exp $
+#	$OpenBSD: syscalls.conf,v 1.12 2011/07/09 00:10:51 deraadt Exp $
 #	$NetBSD: syscalls.conf,v 1.2 1994/10/26 06:45:57 cgd Exp $
 
 sysnames="syscalls.c"
 sysnumhdr="../sys/syscall.h"
 syssw="init_sysent.c"
 sysarghdr="../sys/syscallargs.h"
-compatopts="compat_25"
+compatopts=""
 libcompatopts=""
 
 switchname="sysent"
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 906a07f05ee..46eb2ee9cc0 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-;	$OpenBSD: syscalls.master,v 1.113 2011/07/08 19:19:20 tedu Exp $
+;	$OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp $
 ;	$NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -72,8 +72,7 @@
 16	STD		{ int sys_chown(const char *path, uid_t uid, \
 			    gid_t gid); }
 17	STD		{ int sys_obreak(char *nsize); } break
-18	COMPAT_25	{ int sys_getfsstat(struct statfs *buf, long bufsize, \
-			    int flags); } ogetfsstat
+18	OBSOL		getfsstat25
 19	OBSOL		olseek
 20	STD NOLOCK	{ pid_t sys_getpid(void); }
 21	STD		{ int sys_mount(const char *type, const char *path, \
@@ -150,7 +149,7 @@
 62	OBSOL		fstat43
 63	OBSOL		ogetkerninfo
 64	OBSOL		ogetpagesize
-65	COMPAT_25	{ int sys_omsync(caddr_t addr, size_t len); }
+65	OBSOL		omsync25
 66	STD		{ int sys_vfork(void); }
 67	OBSOL		vread
 68	OBSOL		vwrite
@@ -177,7 +176,7 @@
 			    const struct itimerval *itv, \
 			    struct itimerval *oitv); }
 84	OBSOL		owait
-85	COMPAT_25	{ int sys_swapon(const char *name); }
+85	OBSOL		swapon25
 86	STD		{ int sys_getitimer(int which, \
 			    struct itimerval *itv); }
 87	OBSOL		ogethostname
@@ -196,8 +195,8 @@
 			    socklen_t namelen); }
 99	OBSOL		oaccept
 100	STD		{ int sys_getpriority(int which, id_t who); }
-101	OBSOL	osend
-102	OBSOL	orecv
+101	OBSOL		osend
+102	OBSOL		orecv
 103	STD		{ int sys_sigreturn(struct sigcontext *sigcntxp); }
 104	STD		{ int sys_bind(int s, const struct sockaddr *name, \
 			    socklen_t namelen); }
@@ -274,10 +273,8 @@
 155	UNIMPL
 #endif
 156	OBSOL		ogetdirentries
-157	COMPAT_25	{ int sys_statfs(const char *path, \
-			    struct ostatfs *buf); } ostatfs
-158	COMPAT_25	{ int sys_fstatfs(int fd, struct ostatfs *buf); } \
-			    ostatfs
+157	OBSOL		statfs25
+158	OBSOL		fstatfs
 159	UNIMPL
 160	UNIMPL
 161	STD		{ int sys_getfh(const char *fname, fhandle_t *fhp); }