sync

4 files changed, 15 insertions, 11 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index cd370c19d5f..dda98ef5ee4 100644
--- a/sys/compat/linux/linux_syscall.h
+++ b/sys/compat/linux/linux_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscall.h,v 1.62 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.63 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.60 2011/07/09 00:10:52 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index ab979094176..4026b4f42c2 100644
--- a/sys/compat/linux/linux_syscallargs.h
+++ b/sys/compat/linux/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscallargs.h,v 1.64 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.65 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.60 2011/07/09 00:10:52 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -231,6 +231,10 @@ struct linux_sys_uselib_args {
 	syscallarg(char *) path;
 };
 
+struct linux_sys_swapon_args {
+	syscallarg(char *) name;
+};
+
 struct linux_sys_readdir_args {
 	syscallarg(int) fd;
 	syscallarg(caddr_t) dent;
@@ -683,7 +687,7 @@ int	linux_sys_symlink(struct proc *, void *, register_t *);
 int	linux_sys_lstat(struct proc *, void *, register_t *);
 int	linux_sys_readlink(struct proc *, void *, register_t *);
 int	linux_sys_uselib(struct proc *, void *, register_t *);
-int	compat_25_sys_swapon(struct proc *, void *, register_t *);
+int	linux_sys_swapon(struct proc *, void *, register_t *);
 int	sys_reboot(struct proc *, void *, register_t *);
 int	linux_sys_readdir(struct proc *, void *, register_t *);
 int	linux_sys_mmap(struct proc *, void *, register_t *);
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index 17b13f7f843..ec210bda3dd 100644
--- a/sys/compat/linux/linux_syscalls.c
+++ b/sys/compat/linux/linux_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_syscalls.c,v 1.62 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.63 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.60 2011/07/09 00:10:52 deraadt Exp 
  */
 
 char *linux_syscallnames[] = {
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index 76126c31a36..1cee7edc0a5 100644
--- a/sys/compat/linux/linux_sysent.c
+++ b/sys/compat/linux/linux_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: linux_sysent.c,v 1.63 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.64 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.59 2011/07/08 19:19:20 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.60 2011/07/09 00:10:52 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -205,8 +205,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_readlink },		/* 85 = readlink */
 	{ 1, s(struct linux_sys_uselib_args), 0,
 	    linux_sys_uselib },			/* 86 = uselib */
-	{ 1, s(struct compat_25_sys_swapon_args), 0,
-	    compat_25_sys_swapon },		/* 87 = swapon */
+	{ 1, s(struct linux_sys_swapon_args), 0,
+	    linux_sys_swapon },			/* 87 = swapon */
 	{ 1, s(struct sys_reboot_args), 0,
 	    sys_reboot },			/* 88 = reboot */
 	{ 3, s(struct linux_sys_readdir_args), 0,