Deprecate the swapon system call and move it to COMPAT_25 land, since swapctl

has been introduced for this release.

ok deraadt@ weingart@

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/compat/bsdos/syscalls.master b/sys/compat/bsdos/syscalls.master
index 6139e5c6e37..96999fc6369 100644
--- a/sys/compat/bsdos/syscalls.master
+++ b/sys/compat/bsdos/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.10 2003/01/30 03:29:48 millert Exp $
+	$OpenBSD: syscalls.master,v 1.11 2003/05/10 17:53:53 miod Exp $
 
 ; OpenBSD COMPAT_BSDOS system call name/number "master" file.
 ; (See syscalls.conf to see what it is processed into.)
@@ -160,7 +160,7 @@
 83	NOARGS		{ int sys_setitimer(u_int which, \
 			    struct itimerval *itv, struct itimerval *oitv); }
 84	NOARGS		{ int compat_43_sys_wait(void); } owait
-85	NOARGS		{ int sys_swapon(char *name); }
+85	NOARGS		{ int compat_25_sys_swapon(char *name); }
 86	NOARGS		{ int sys_getitimer(u_int which, \
 			    struct itimerval *itv); }
 87	NOARGS		{ int compat_43_sys_gethostname(char *hostname, \
diff --git a/sys/compat/common/compat_vm.c b/sys/compat/common/compat_vm.c
index 1c801d90c5a..33debd070f1 100644
--- a/sys/compat/common/compat_vm.c
+++ b/sys/compat/common/compat_vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compat_vm.c,v 1.2 2003/04/29 19:52:30 miod Exp $	*/
+/*	$OpenBSD: compat_vm.c,v 1.3 2003/05/10 17:53:56 miod Exp $	*/
 /*	$NetBSD: vm_12.c,v 1.8 1997/10/20 22:05:22 thorpej Exp $	*/
 
 /*
@@ -38,13 +38,13 @@
 #include <sys/mman.h>
 
 int
-sys_swapon(p, v, retval)
+compat_25_sys_swapon(p, v, retval)
 	struct proc *p;
 	void *v;
 	register_t *retval;
 {
 	struct sys_swapctl_args ua;
-	struct sys_swapon_args /* {
+	struct compat_25_sys_swapon_args /* {
 		syscallarg(const char *) name;
 	} */ *uap = v;
 
diff --git a/sys/compat/freebsd/syscalls.master b/sys/compat/freebsd/syscalls.master
index 478a3b464d2..042539c69a2 100644
--- a/sys/compat/freebsd/syscalls.master
+++ b/sys/compat/freebsd/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.20 2003/01/30 03:29:49 millert Exp $
+	$OpenBSD: syscalls.master,v 1.21 2003/05/10 17:53:57 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.3 1995/10/10 18:28:40 mycroft Exp $
 
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -170,7 +170,7 @@
 83	NOARGS		{ int sys_setitimer(u_int which, \
 			    struct itimerval *itv, struct itimerval *oitv); }
 84	NOARGS		{ int compat_43_sys_wait(void); } owait
-85	NOARGS		{ int sys_swapon(char *name); }
+85	NOARGS		{ int compat_25_sys_swapon(char *name); }
 86	NOARGS		{ int sys_getitimer(u_int which, \
 			    struct itimerval *itv); }
 87	NOARGS		{ int compat_43_sys_gethostname(char *hostname, \
diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master
index 7e08a7175f2..da7e10bf65b 100644
--- a/sys/compat/linux/syscalls.master
+++ b/sys/compat/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$OpenBSD: syscalls.master,v 1.36 2002/10/30 20:10:48 millert Exp $
+	$OpenBSD: syscalls.master,v 1.37 2003/05/10 17:53:57 miod Exp $
 ;	$NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
@@ -155,7 +155,7 @@
 85	STD		{ int linux_sys_readlink(char *name, char *buf, \
 			    int count); }
 86	STD		{ int linux_sys_uselib(char *path); }
-87	NOARGS		{ int sys_swapon(char *name); }
+87	NOARGS		{ int compat_25_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); }