sync

4 files changed, 29 insertions, 102 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index f45c1ef96f1..ea362982a91 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.111 2010/06/29 00:29:05 tedu Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.112 2010/07/01 01:55:33 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.99 2010/06/29 00:28:14 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.100 2010/07/01 01:54:38 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -34,12 +34,6 @@
 #define compat_10(func) sys_nosys
 #endif
 
-#ifdef COMPAT_23
-#define compat_23(func) __CONCAT(compat_23_,func)
-#else
-#define compat_23(func) sys_nosys
-#endif
-
 #ifdef COMPAT_25
 #define compat_25(func) __CONCAT(compat_25_,func)
 #else
@@ -52,12 +46,6 @@
 #define compat_35(func) sys_nosys
 #endif
 
-#ifdef COMPAT_O43
-#define compat_o43(func) __CONCAT(compat_o43_,func)
-#else
-#define compat_o43(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -571,8 +559,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 219 = unimplemented */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-	{ 4, s(struct compat_23_sys___semctl_args), 0,
-	    compat_23(sys___semctl) },		/* 220 = compat_23 semctl23 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 220 = unimplemented */
 	{ 3, s(struct sys_semget_args), 0,
 	    sys_semget },			/* 221 = semget */
 	{ 3, s(struct compat_35_sys_semop_args), 0,
@@ -590,8 +578,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 223 = unimplemented semconfig */
 #endif
 #ifdef SYSVMSG
-	{ 3, s(struct compat_23_sys_msgctl_args), 0,
-	    compat_23(sys_msgctl) },		/* 224 = compat_23 msgctl23 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 224 = unimplemented */
 	{ 2, s(struct sys_msgget_args), 0,
 	    sys_msgget },			/* 225 = msgget */
 	{ 4, s(struct sys_msgsnd_args), 0,
@@ -611,8 +599,8 @@ struct sysent sysent[] = {
 #ifdef SYSVSHM
 	{ 3, s(struct sys_shmat_args), 0,
 	    sys_shmat },			/* 228 = shmat */
-	{ 3, s(struct compat_23_sys_shmctl_args), 0,
-	    compat_23(sys_shmctl) },		/* 229 = compat_23 shmctl23 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 229 = unimplemented */
 	{ 1, s(struct sys_shmdt_args), 0,
 	    sys_shmdt },			/* 230 = shmdt */
 	{ 3, s(struct compat_35_sys_shmget_args), 0,
@@ -698,20 +686,20 @@ struct sysent sysent[] = {
 	{ 0, 0, 0,
 	    sys_nosys },			/* 259 = unimplemented */
 #endif
-	{ 3, s(struct compat_o43_sys_getfsstat_args), 0,
-	    compat_o43(sys_getfsstat) },	/* 260 = compat_o43 getfsstat */
-	{ 2, s(struct compat_o43_sys_statfs_args), 0,
-	    compat_o43(sys_statfs) },		/* 261 = compat_o43 statfs */
-	{ 2, s(struct compat_o43_sys_fstatfs_args), 0,
-	    compat_o43(sys_fstatfs) },		/* 262 = compat_o43 fstatfs */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 260 = unimplemented */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 261 = unimplemented */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 262 = unimplemented */
 	{ 1, s(struct sys_pipe_args), 0,
 	    sys_pipe },				/* 263 = pipe */
 	{ 2, s(struct sys_fhopen_args), 0,
 	    sys_fhopen },			/* 264 = fhopen */
 	{ 2, s(struct compat_35_sys_fhstat_args), 0,
 	    compat_35(sys_fhstat) },		/* 265 = compat_35 fhstat */
-	{ 2, s(struct compat_o43_sys_fhstatfs_args), 0,
-	    compat_o43(sys_fhstatfs) },		/* 266 = compat_o43 fhstatfs */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 266 = unimplemented */
 	{ 5, s(struct sys_preadv_args), 0,
 	    sys_preadv },			/* 267 = preadv */
 	{ 5, s(struct sys_pwritev_args), 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index d46f94ee507..2275ebc0b53 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.112 2010/06/29 00:29:05 tedu Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.113 2010/07/01 01:55:33 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.99 2010/06/29 00:28:14 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.100 2010/07/01 01:54:38 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -277,7 +277,7 @@ char *syscallnames[] = {
 	"#219 (unimplemented)",		/* 219 = unimplemented */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-	"compat_23_semctl23",	/* 220 = compat_23 semctl23 */
+	"#220 (unimplemented)",		/* 220 = unimplemented */
 	"semget",			/* 221 = semget */
 	"compat_35_semop",	/* 222 = compat_35 semop */
 	"#223 (obsolete sys_semconfig)",		/* 223 = obsolete sys_semconfig */
@@ -288,7 +288,7 @@ char *syscallnames[] = {
 	"#223 (unimplemented semconfig)",		/* 223 = unimplemented semconfig */
 #endif
 #ifdef SYSVMSG
-	"compat_23_msgctl23",	/* 224 = compat_23 msgctl23 */
+	"#224 (unimplemented)",		/* 224 = unimplemented */
 	"msgget",			/* 225 = msgget */
 	"msgsnd",			/* 226 = msgsnd */
 	"msgrcv",			/* 227 = msgrcv */
@@ -300,7 +300,7 @@ char *syscallnames[] = {
 #endif
 #ifdef SYSVSHM
 	"shmat",			/* 228 = shmat */
-	"compat_23_shmctl23",	/* 229 = compat_23 shmctl23 */
+	"#229 (unimplemented)",		/* 229 = unimplemented */
 	"shmdt",			/* 230 = shmdt */
 	"compat_35_shmget",	/* 231 = compat_35 shmget */
 #else
@@ -349,13 +349,13 @@ char *syscallnames[] = {
 #else
 	"#259 (unimplemented)",		/* 259 = unimplemented */
 #endif
-	"compat_o43_getfsstat",	/* 260 = compat_o43 getfsstat */
-	"compat_o43_statfs",	/* 261 = compat_o43 statfs */
-	"compat_o43_fstatfs",	/* 262 = compat_o43 fstatfs */
+	"#260 (unimplemented)",		/* 260 = unimplemented */
+	"#261 (unimplemented)",		/* 261 = unimplemented */
+	"#262 (unimplemented)",		/* 262 = unimplemented */
 	"pipe",			/* 263 = pipe */
 	"fhopen",			/* 264 = fhopen */
 	"compat_35_fhstat",	/* 265 = compat_35 fhstat */
-	"compat_o43_fhstatfs",	/* 266 = compat_o43 fhstatfs */
+	"#266 (unimplemented)",		/* 266 = unimplemented */
 	"preadv",			/* 267 = preadv */
 	"pwritev",			/* 268 = pwritev */
 	"kqueue",			/* 269 = kqueue */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 914a007ddb4..c71be747a66 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.111 2010/06/29 00:29:05 tedu Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.112 2010/07/01 01:55:33 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.99 2010/06/29 00:28:14 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.100 2010/07/01 01:54:38 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -508,16 +508,12 @@
 /* syscall: "nnpfspioctl" ret: "int" args: "int" "char *" "int" "struct ViceIoctl *" "int" */
 #define	SYS_nnpfspioctl	208
 
-				/* 220 is compat_23 semctl23 */
-
 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
 #define	SYS_semget	221
 
 				/* 222 is compat_35 semop */
 
 				/* 223 is obsolete sys_semconfig */
-				/* 224 is compat_23 msgctl23 */
-
 /* syscall: "msgget" ret: "int" args: "key_t" "int" */
 #define	SYS_msgget	225
 
@@ -530,8 +526,6 @@
 /* syscall: "shmat" ret: "void *" args: "int" "const void *" "int" */
 #define	SYS_shmat	228
 
-				/* 229 is compat_23 shmctl23 */
-
 /* syscall: "shmdt" ret: "int" args: "const void *" */
 #define	SYS_shmdt	230
 
@@ -576,12 +570,6 @@
 
 				/* 259 is compat_35 msgctl35 */
 
-				/* 260 is compat_o43 getfsstat */
-
-				/* 261 is compat_o43 statfs */
-
-				/* 262 is compat_o43 fstatfs */
-
 /* syscall: "pipe" ret: "int" args: "int *" */
 #define	SYS_pipe	263
 
@@ -590,8 +578,6 @@
 
 				/* 265 is compat_35 fhstat */
 
-				/* 266 is compat_o43 fhstatfs */
-
 /* syscall: "preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
 #define	SYS_preadv	267
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 593745a5b99..8b20b769487 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.113 2010/06/29 00:29:05 tedu Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.114 2010/07/01 01:55:33 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.99 2010/06/29 00:28:14 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.100 2010/07/01 01:54:38 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -907,13 +907,6 @@ struct sys_nnpfspioctl_args {
 	syscallarg(int) a_followSymlinks;
 };
 
-struct compat_23_sys___semctl_args {
-	syscallarg(int) semid;
-	syscallarg(int) semnum;
-	syscallarg(int) cmd;
-	syscallarg(union semun *) arg;
-};
-
 struct sys_semget_args {
 	syscallarg(key_t) key;
 	syscallarg(int) nsems;
@@ -926,12 +919,6 @@ struct compat_35_sys_semop_args {
 	syscallarg(u_int) nsops;
 };
 
-struct compat_23_sys_msgctl_args {
-	syscallarg(int) msqid;
-	syscallarg(int) cmd;
-	syscallarg(struct omsqid_ds *) buf;
-};
-
 struct sys_msgget_args {
 	syscallarg(key_t) key;
 	syscallarg(int) msgflg;
@@ -958,12 +945,6 @@ struct sys_shmat_args {
 	syscallarg(int) shmflg;
 };
 
-struct compat_23_sys_shmctl_args {
-	syscallarg(int) shmid;
-	syscallarg(int) cmd;
-	syscallarg(struct oshmid_ds *) buf;
-};
-
 struct sys_shmdt_args {
 	syscallarg(const void *) shmaddr;
 };
@@ -1045,22 +1026,6 @@ struct compat_35_sys_msgctl_args {
 	syscallarg(struct msqid_ds35 *) buf;
 };
 
-struct compat_o43_sys_getfsstat_args {
-	syscallarg(struct o43statfs *) buf;
-	syscallarg(size_t) bufsize;
-	syscallarg(int) flags;
-};
-
-struct compat_o43_sys_statfs_args {
-	syscallarg(const char *) path;
-	syscallarg(struct o43statfs *) buf;
-};
-
-struct compat_o43_sys_fstatfs_args {
-	syscallarg(int) fd;
-	syscallarg(struct o43statfs *) buf;
-};
-
 struct sys_pipe_args {
 	syscallarg(int *) fdp;
 };
@@ -1075,11 +1040,6 @@ struct compat_35_sys_fhstat_args {
 	syscallarg(struct stat35 *) sb;
 };
 
-struct compat_o43_sys_fhstatfs_args {
-	syscallarg(const fhandle_t *) fhp;
-	syscallarg(struct o43statfs *) buf;
-};
-
 struct sys_preadv_args {
 	syscallarg(int) fd;
 	syscallarg(const struct iovec *) iovp;
@@ -1485,13 +1445,11 @@ int	sys_lkmnosys(struct proc *, void *, register_t *);
 #else	/* !LKM */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-int	compat_23_sys___semctl(struct proc *, void *, register_t *);
 int	sys_semget(struct proc *, void *, register_t *);
 int	compat_35_sys_semop(struct proc *, void *, register_t *);
 #else
 #endif
 #ifdef SYSVMSG
-int	compat_23_sys_msgctl(struct proc *, void *, register_t *);
 int	sys_msgget(struct proc *, void *, register_t *);
 int	sys_msgsnd(struct proc *, void *, register_t *);
 int	sys_msgrcv(struct proc *, void *, register_t *);
@@ -1499,7 +1457,6 @@ int	sys_msgrcv(struct proc *, void *, register_t *);
 #endif
 #ifdef SYSVSHM
 int	sys_shmat(struct proc *, void *, register_t *);
-int	compat_23_sys_shmctl(struct proc *, void *, register_t *);
 int	sys_shmdt(struct proc *, void *, register_t *);
 int	compat_35_sys_shmget(struct proc *, void *, register_t *);
 #else
@@ -1527,13 +1484,9 @@ int	compat_35_sys_shmctl(struct proc *, void *, register_t *);
 int	compat_35_sys_msgctl(struct proc *, void *, register_t *);
 #else
 #endif
-int	compat_o43_sys_getfsstat(struct proc *, void *, register_t *);
-int	compat_o43_sys_statfs(struct proc *, void *, register_t *);
-int	compat_o43_sys_fstatfs(struct proc *, void *, register_t *);
 int	sys_pipe(struct proc *, void *, register_t *);
 int	sys_fhopen(struct proc *, void *, register_t *);
 int	compat_35_sys_fhstat(struct proc *, void *, register_t *);
-int	compat_o43_sys_fhstatfs(struct proc *, void *, register_t *);
 int	sys_preadv(struct proc *, void *, register_t *);
 int	sys_pwritev(struct proc *, void *, register_t *);
 int	sys_kqueue(struct proc *, void *, register_t *);