sync

8 files changed, 43 insertions, 104 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,
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 25594a69c65..311145fee49 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.125 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.126 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.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -16,36 +16,6 @@
 #include <sys/event.h>
 #include <nnpfs/nnpfs_pioctl.h>
 
-#ifdef COMPAT_43
-#define compat_43(func) __CONCAT(compat_43_,func)
-#else
-#define compat_43(func) sys_nosys
-#endif
-
-#ifdef COMPAT_09
-#define compat_09(func) __CONCAT(compat_09_,func)
-#else
-#define compat_09(func) sys_nosys
-#endif
-
-#ifdef COMPAT_10
-#define compat_10(func) __CONCAT(compat_10_,func)
-#else
-#define compat_10(func) sys_nosys
-#endif
-
-#ifdef COMPAT_25
-#define compat_25(func) __CONCAT(compat_25_,func)
-#else
-#define compat_25(func) sys_nosys
-#endif
-
-#ifdef COMPAT_35
-#define compat_35(func) __CONCAT(compat_35_,func)
-#else
-#define compat_35(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -85,8 +55,8 @@ struct sysent sysent[] = {
 	    sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args), 0,
 	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct compat_25_sys_getfsstat_args), 0,
-	    compat_25(sys_getfsstat) },		/* 18 = compat_25 ogetfsstat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 18 = obsolete getfsstat25 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 19 = obsolete olseek */
 	{ 0, 0, SY_NOLOCK | 0,
@@ -194,8 +164,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 63 = obsolete ogetkerninfo */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 64 = obsolete ogetpagesize */
-	{ 2, s(struct compat_25_sys_omsync_args), 0,
-	    compat_25(sys_omsync) },		/* 65 = compat_25 omsync */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 65 = obsolete omsync25 */
 	{ 0, 0, 0,
 	    sys_vfork },			/* 66 = vfork */
 	{ 0, 0, 0,
@@ -234,8 +204,8 @@ struct sysent sysent[] = {
 	    sys_setitimer },			/* 83 = setitimer */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 84 = obsolete owait */
-	{ 1, s(struct compat_25_sys_swapon_args), 0,
-	    compat_25(sys_swapon) },		/* 85 = compat_25 swapon */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 85 = obsolete swapon25 */
 	{ 2, s(struct sys_getitimer_args), 0,
 	    sys_getitimer },			/* 86 = getitimer */
 	{ 0, 0, 0,
@@ -383,10 +353,10 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 156 = obsolete ogetdirentries */
-	{ 2, s(struct compat_25_sys_statfs_args), 0,
-	    compat_25(sys_statfs) },		/* 157 = compat_25 ostatfs */
-	{ 2, s(struct compat_25_sys_fstatfs_args), 0,
-	    compat_25(sys_fstatfs) },		/* 158 = compat_25 ostatfs */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 157 = obsolete statfs25 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 158 = obsolete fstatfs */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index f1a10b87262..f1846190a55 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.126 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.127 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.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -26,7 +26,7 @@ char *syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"compat_25_ogetfsstat",	/* 18 = compat_25 ogetfsstat */
+	"#18 (obsolete getfsstat25)",		/* 18 = obsolete getfsstat25 */
 	"#19 (obsolete olseek)",		/* 19 = obsolete olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -85,7 +85,7 @@ char *syscallnames[] = {
 	"#62 (obsolete fstat43)",		/* 62 = obsolete fstat43 */
 	"#63 (obsolete ogetkerninfo)",		/* 63 = obsolete ogetkerninfo */
 	"#64 (obsolete ogetpagesize)",		/* 64 = obsolete ogetpagesize */
-	"compat_25_omsync",	/* 65 = compat_25 omsync */
+	"#65 (obsolete omsync25)",		/* 65 = obsolete omsync25 */
 	"vfork",			/* 66 = vfork */
 	"#67 (obsolete vread)",		/* 67 = obsolete vread */
 	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
@@ -105,7 +105,7 @@ char *syscallnames[] = {
 	"setpgid",			/* 82 = setpgid */
 	"setitimer",			/* 83 = setitimer */
 	"#84 (obsolete owait)",		/* 84 = obsolete owait */
-	"compat_25_swapon",	/* 85 = compat_25 swapon */
+	"#85 (obsolete swapon25)",		/* 85 = obsolete swapon25 */
 	"getitimer",			/* 86 = getitimer */
 	"#87 (obsolete ogethostname)",		/* 87 = obsolete ogethostname */
 	"#88 (obsolete osethostname)",		/* 88 = obsolete osethostname */
@@ -181,8 +181,8 @@ char *syscallnames[] = {
 	"#155 (unimplemented)",		/* 155 = unimplemented */
 #endif
 	"#156 (obsolete ogetdirentries)",		/* 156 = obsolete ogetdirentries */
-	"compat_25_ostatfs",	/* 157 = compat_25 ostatfs */
-	"compat_25_ostatfs",	/* 158 = compat_25 ostatfs */
+	"#157 (obsolete statfs25)",		/* 157 = obsolete statfs25 */
+	"#158 (obsolete fstatfs)",		/* 158 = obsolete fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 	"getfh",			/* 161 = getfh */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 20d02ff4249..4fcf93a8af3 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.125 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.126 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.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -57,8 +57,7 @@
 /* syscall: "break" ret: "int" args: "char *" */
 #define	SYS_break	17
 
-				/* 18 is compat_25 ogetfsstat */
-
+				/* 18 is obsolete getfsstat25 */
 				/* 19 is obsolete olseek */
 /* syscall: "getpid" ret: "pid_t" args: */
 #define	SYS_getpid	20
@@ -183,8 +182,7 @@
 				/* 62 is obsolete fstat43 */
 				/* 63 is obsolete ogetkerninfo */
 				/* 64 is obsolete ogetpagesize */
-				/* 65 is compat_25 omsync */
-
+				/* 65 is obsolete omsync25 */
 /* syscall: "vfork" ret: "int" args: */
 #define	SYS_vfork	66
 
@@ -228,8 +226,7 @@
 #define	SYS_setitimer	83
 
 				/* 84 is obsolete owait */
-				/* 85 is compat_25 swapon */
-
+				/* 85 is obsolete swapon25 */
 /* syscall: "getitimer" ret: "int" args: "int" "struct itimerval *" */
 #define	SYS_getitimer	86
 
@@ -369,10 +366,8 @@
 #define	SYS_nfssvc	155
 
 				/* 156 is obsolete ogetdirentries */
-				/* 157 is compat_25 ostatfs */
-
-				/* 158 is compat_25 ostatfs */
-
+				/* 157 is obsolete statfs25 */
+				/* 158 is obsolete fstatfs */
 /* syscall: "getfh" ret: "int" args: "const char *" "fhandle_t *" */
 #define	SYS_getfh	161
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 00a3124f8ac..ddb7597d9cd 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.127 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.128 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.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -94,12 +94,6 @@ struct sys_obreak_args {
 	syscallarg(char *) nsize;
 };
 
-struct compat_25_sys_getfsstat_args {
-	syscallarg(struct statfs *) buf;
-	syscallarg(long) bufsize;
-	syscallarg(int) flags;
-};
-
 struct sys_mount_args {
 	syscallarg(const char *) type;
 	syscallarg(const char *) path;
@@ -268,11 +262,6 @@ struct sys_chroot_args {
 	syscallarg(const char *) path;
 };
 
-struct compat_25_sys_omsync_args {
-	syscallarg(caddr_t) addr;
-	syscallarg(size_t) len;
-};
-
 struct sys_sbrk_args {
 	syscallarg(int) incr;
 };
@@ -325,10 +314,6 @@ struct sys_setitimer_args {
 	syscallarg(struct itimerval *) oitv;
 };
 
-struct compat_25_sys_swapon_args {
-	syscallarg(const char *) name;
-};
-
 struct sys_getitimer_args {
 	syscallarg(int) which;
 	syscallarg(struct itimerval *) itv;
@@ -530,16 +515,6 @@ struct sys_nfssvc_args {
 	syscallarg(void *) argp;
 };
 
-struct compat_25_sys_statfs_args {
-	syscallarg(const char *) path;
-	syscallarg(struct ostatfs *) buf;
-};
-
-struct compat_25_sys_fstatfs_args {
-	syscallarg(int) fd;
-	syscallarg(struct ostatfs *) buf;
-};
-
 struct sys_getfh_args {
 	syscallarg(const char *) fname;
 	syscallarg(fhandle_t *) fhp;
@@ -1097,7 +1072,6 @@ int	sys_mknod(struct proc *, void *, register_t *);
 int	sys_chmod(struct proc *, void *, register_t *);
 int	sys_chown(struct proc *, void *, register_t *);
 int	sys_obreak(struct proc *, void *, register_t *);
-int	compat_25_sys_getfsstat(struct proc *, void *, register_t *);
 int	sys_getpid(struct proc *, void *, register_t *);
 int	sys_mount(struct proc *, void *, register_t *);
 int	sys_unmount(struct proc *, void *, register_t *);
@@ -1146,7 +1120,6 @@ int	sys_readlink(struct proc *, void *, register_t *);
 int	sys_execve(struct proc *, void *, register_t *);
 int	sys_umask(struct proc *, void *, register_t *);
 int	sys_chroot(struct proc *, void *, register_t *);
-int	compat_25_sys_omsync(struct proc *, void *, register_t *);
 int	sys_vfork(struct proc *, void *, register_t *);
 int	sys_sbrk(struct proc *, void *, register_t *);
 int	sys_sstk(struct proc *, void *, register_t *);
@@ -1159,7 +1132,6 @@ int	sys_setgroups(struct proc *, void *, register_t *);
 int	sys_getpgrp(struct proc *, void *, register_t *);
 int	sys_setpgid(struct proc *, void *, register_t *);
 int	sys_setitimer(struct proc *, void *, register_t *);
-int	compat_25_sys_swapon(struct proc *, void *, register_t *);
 int	sys_getitimer(struct proc *, void *, register_t *);
 int	sys_dup2(struct proc *, void *, register_t *);
 int	sys_fcntl(struct proc *, void *, register_t *);
@@ -1200,8 +1172,6 @@ int	sys_quotactl(struct proc *, void *, register_t *);
 int	sys_nfssvc(struct proc *, void *, register_t *);
 #else
 #endif
-int	compat_25_sys_statfs(struct proc *, void *, register_t *);
-int	compat_25_sys_fstatfs(struct proc *, void *, register_t *);
 int	sys_getfh(struct proc *, void *, register_t *);
 int	sys_sysarch(struct proc *, void *, register_t *);
 int	sys_pread(struct proc *, void *, register_t *);