sync

4 files changed, 40 insertions, 147 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 49035153a91..d156c698732 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.118 2011/06/01 06:22:39 guenther Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.119 2011/06/30 13:44:15 tedu Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.107 2011/06/01 06:20:41 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.108 2011/06/30 13:43:14 tedu Exp 
  */
 
 #include <sys/param.h>
@@ -471,12 +471,12 @@ struct sysent sysent[] = {
 	{ 0, 0, 0,
 	    sys_nosys },			/* 187 = unimplemented */
 #endif
-	{ 2, s(struct compat_35_sys_stat_args), 0,
-	    compat_35(sys_stat) },		/* 188 = compat_35 stat35 */
-	{ 2, s(struct compat_35_sys_fstat_args), 0,
-	    compat_35(sys_fstat) },		/* 189 = compat_35 fstat35 */
-	{ 2, s(struct compat_35_sys_lstat_args), 0,
-	    compat_35(sys_lstat) },		/* 190 = compat_35 lstat35 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 188 = obsolete stat35 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 189 = obsolete fstat35 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 190 = obsolete lstat35 */
 	{ 2, s(struct sys_pathconf_args), 0,
 	    sys_pathconf },			/* 191 = pathconf */
 	{ 2, s(struct sys_fpathconf_args), 0,
@@ -563,20 +563,16 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 220 = unimplemented */
 	{ 3, s(struct sys_semget_args), 0,
 	    sys_semget },			/* 221 = semget */
-	{ 3, s(struct compat_35_sys_semop_args), 0,
-	    compat_35(sys_semop) },		/* 222 = compat_35 semop */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 223 = obsolete sys_semconfig */
 #else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 220 = unimplemented semctl */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 221 = unimplemented semget */
+#endif
 	{ 0, 0, 0,
-	    sys_nosys },			/* 222 = unimplemented semop */
+	    sys_nosys },			/* 222 = obsolete semop35 */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 223 = unimplemented semconfig */
-#endif
+	    sys_nosys },			/* 223 = obsolete semconfig35 */
 #ifdef SYSVMSG
 	{ 0, 0, 0,
 	    sys_nosys },			/* 224 = unimplemented */
@@ -603,8 +599,6 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 229 = unimplemented */
 	{ 1, s(struct sys_shmdt_args), 0,
 	    sys_shmdt },			/* 230 = shmdt */
-	{ 3, s(struct compat_35_sys_shmget_args), 0,
-	    compat_35(sys_shmget) },		/* 231 = compat_35 shmget */
 #else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 228 = unimplemented shmat */
@@ -612,9 +606,9 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 229 = unimplemented shmctl */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 230 = unimplemented shmdt */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 231 = unimplemented shmget */
 #endif
+	{ 0, 0, 0,
+	    sys_nosys },			/* 231 = obsolete shmget35 */
 	{ 2, s(struct sys_clock_gettime_args), SY_NOLOCK | 0,
 	    sys_clock_gettime },		/* 232 = clock_gettime */
 	{ 2, s(struct sys_clock_settime_args), 0,
@@ -665,27 +659,12 @@ struct sysent sysent[] = {
 	    sys_getsid },			/* 255 = getsid */
 	{ 3, s(struct sys_msync_args), 0,
 	    sys_msync },			/* 256 = msync */
-#ifdef SYSVSEM
-	{ 4, s(struct compat_35_sys___semctl_args), 0,
-	    compat_35(sys___semctl) },		/* 257 = compat_35 semctl35 */
-#else
 	{ 0, 0, 0,
-	    sys_nosys },			/* 257 = unimplemented */
-#endif
-#ifdef SYSVSHM
-	{ 3, s(struct compat_35_sys_shmctl_args), 0,
-	    compat_35(sys_shmctl) },		/* 258 = compat_35 shmctl35 */
-#else
+	    sys_nosys },			/* 257 = obsolete semctl35 */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 258 = unimplemented */
-#endif
-#ifdef SYSVMSG
-	{ 3, s(struct compat_35_sys_msgctl_args), 0,
-	    compat_35(sys_msgctl) },		/* 259 = compat_35 msgctl35 */
-#else
+	    sys_nosys },			/* 258 = obsolete shmctl35 */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 259 = unimplemented */
-#endif
+	    sys_nosys },			/* 259 = obsolete msgctl35 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 260 = unimplemented */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index d8694fa0895..97fec230aaa 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.119 2011/06/01 06:22:39 guenther Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.120 2011/06/30 13:44:15 tedu Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.107 2011/06/01 06:20:41 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.108 2011/06/30 13:43:14 tedu Exp 
  */
 
 char *syscallnames[] = {
@@ -231,9 +231,9 @@ char *syscallnames[] = {
 	"#186 (unimplemented)",		/* 186 = unimplemented */
 	"#187 (unimplemented)",		/* 187 = unimplemented */
 #endif
-	"compat_35_stat35",	/* 188 = compat_35 stat35 */
-	"compat_35_fstat35",	/* 189 = compat_35 fstat35 */
-	"compat_35_lstat35",	/* 190 = compat_35 lstat35 */
+	"#188 (obsolete stat35)",		/* 188 = obsolete stat35 */
+	"#189 (obsolete fstat35)",		/* 189 = obsolete fstat35 */
+	"#190 (obsolete lstat35)",		/* 190 = obsolete lstat35 */
 	"pathconf",			/* 191 = pathconf */
 	"fpathconf",			/* 192 = fpathconf */
 	"swapctl",			/* 193 = swapctl */
@@ -279,14 +279,12 @@ char *syscallnames[] = {
 #ifdef SYSVSEM
 	"#220 (unimplemented)",		/* 220 = unimplemented */
 	"semget",			/* 221 = semget */
-	"compat_35_semop",	/* 222 = compat_35 semop */
-	"#223 (obsolete sys_semconfig)",		/* 223 = obsolete sys_semconfig */
 #else
 	"#220 (unimplemented semctl)",		/* 220 = unimplemented semctl */
 	"#221 (unimplemented semget)",		/* 221 = unimplemented semget */
-	"#222 (unimplemented semop)",		/* 222 = unimplemented semop */
-	"#223 (unimplemented semconfig)",		/* 223 = unimplemented semconfig */
 #endif
+	"#222 (obsolete semop35)",		/* 222 = obsolete semop35 */
+	"#223 (obsolete semconfig35)",		/* 223 = obsolete semconfig35 */
 #ifdef SYSVMSG
 	"#224 (unimplemented)",		/* 224 = unimplemented */
 	"msgget",			/* 225 = msgget */
@@ -302,13 +300,12 @@ char *syscallnames[] = {
 	"shmat",			/* 228 = shmat */
 	"#229 (unimplemented)",		/* 229 = unimplemented */
 	"shmdt",			/* 230 = shmdt */
-	"compat_35_shmget",	/* 231 = compat_35 shmget */
 #else
 	"#228 (unimplemented shmat)",		/* 228 = unimplemented shmat */
 	"#229 (unimplemented shmctl)",		/* 229 = unimplemented shmctl */
 	"#230 (unimplemented shmdt)",		/* 230 = unimplemented shmdt */
-	"#231 (unimplemented shmget)",		/* 231 = unimplemented shmget */
 #endif
+	"#231 (obsolete shmget35)",		/* 231 = obsolete shmget35 */
 	"clock_gettime",			/* 232 = clock_gettime */
 	"clock_settime",			/* 233 = clock_settime */
 	"clock_getres",			/* 234 = clock_getres */
@@ -334,21 +331,9 @@ char *syscallnames[] = {
 	"lchown",			/* 254 = lchown */
 	"getsid",			/* 255 = getsid */
 	"msync",			/* 256 = msync */
-#ifdef SYSVSEM
-	"compat_35_semctl35",	/* 257 = compat_35 semctl35 */
-#else
-	"#257 (unimplemented)",		/* 257 = unimplemented */
-#endif
-#ifdef SYSVSHM
-	"compat_35_shmctl35",	/* 258 = compat_35 shmctl35 */
-#else
-	"#258 (unimplemented)",		/* 258 = unimplemented */
-#endif
-#ifdef SYSVMSG
-	"compat_35_msgctl35",	/* 259 = compat_35 msgctl35 */
-#else
-	"#259 (unimplemented)",		/* 259 = unimplemented */
-#endif
+	"#257 (obsolete semctl35)",		/* 257 = obsolete semctl35 */
+	"#258 (obsolete shmctl35)",		/* 258 = obsolete shmctl35 */
+	"#259 (obsolete msgctl35)",		/* 259 = obsolete msgctl35 */
 	"#260 (unimplemented)",		/* 260 = unimplemented */
 	"#261 (unimplemented)",		/* 261 = unimplemented */
 	"#262 (unimplemented)",		/* 262 = unimplemented */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 26d1c92e922..0bfaac0ea45 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.118 2011/06/01 06:22:39 guenther Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.119 2011/06/30 13:44:15 tedu Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.107 2011/06/01 06:20:41 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.108 2011/06/30 13:43:14 tedu Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -451,12 +451,9 @@
 /* syscall: "lfs_segwait" ret: "int" args: "fsid_t *" "struct timeval *" */
 #define	SYS_lfs_segwait	187
 
-				/* 188 is compat_35 stat35 */
-
-				/* 189 is compat_35 fstat35 */
-
-				/* 190 is compat_35 lstat35 */
-
+				/* 188 is obsolete stat35 */
+				/* 189 is obsolete fstat35 */
+				/* 190 is obsolete lstat35 */
 /* syscall: "pathconf" ret: "long" args: "const char *" "int" */
 #define	SYS_pathconf	191
 
@@ -511,9 +508,8 @@
 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
 #define	SYS_semget	221
 
-				/* 222 is compat_35 semop */
-
-				/* 223 is obsolete sys_semconfig */
+				/* 222 is obsolete semop35 */
+				/* 223 is obsolete semconfig35 */
 /* syscall: "msgget" ret: "int" args: "key_t" "int" */
 #define	SYS_msgget	225
 
@@ -529,8 +525,7 @@
 /* syscall: "shmdt" ret: "int" args: "const void *" */
 #define	SYS_shmdt	230
 
-				/* 231 is compat_35 shmget */
-
+				/* 231 is obsolete shmget35 */
 /* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */
 #define	SYS_clock_gettime	232
 
@@ -564,12 +559,9 @@
 /* syscall: "msync" ret: "int" args: "void *" "size_t" "int" */
 #define	SYS_msync	256
 
-				/* 257 is compat_35 semctl35 */
-
-				/* 258 is compat_35 shmctl35 */
-
-				/* 259 is compat_35 msgctl35 */
-
+				/* 257 is obsolete semctl35 */
+				/* 258 is obsolete shmctl35 */
+				/* 259 is obsolete msgctl35 */
 /* syscall: "pipe" ret: "int" args: "int *" */
 #define	SYS_pipe	263
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 75ba7b422b3..8e796044eae 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.120 2011/06/01 06:22:39 guenther Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.121 2011/06/30 13:44:15 tedu Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.107 2011/06/01 06:20:41 guenther Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.108 2011/06/30 13:43:14 tedu Exp 
  */
 
 #ifdef	syscallarg
@@ -794,21 +794,6 @@ struct lfs_segwait_args {
 	syscallarg(struct timeval *) tv;
 };
 
-struct compat_35_sys_stat_args {
-	syscallarg(const char *) path;
-	syscallarg(struct stat35 *) ub;
-};
-
-struct compat_35_sys_fstat_args {
-	syscallarg(int) fd;
-	syscallarg(struct stat35 *) sb;
-};
-
-struct compat_35_sys_lstat_args {
-	syscallarg(const char *) path;
-	syscallarg(struct stat35 *) ub;
-};
-
 struct sys_pathconf_args {
 	syscallarg(const char *) path;
 	syscallarg(int) name;
@@ -913,12 +898,6 @@ struct sys_semget_args {
 	syscallarg(int) semflg;
 };
 
-struct compat_35_sys_semop_args {
-	syscallarg(int) semid;
-	syscallarg(struct sembuf *) sops;
-	syscallarg(u_int) nsops;
-};
-
 struct sys_msgget_args {
 	syscallarg(key_t) key;
 	syscallarg(int) msgflg;
@@ -949,12 +928,6 @@ struct sys_shmdt_args {
 	syscallarg(const void *) shmaddr;
 };
 
-struct compat_35_sys_shmget_args {
-	syscallarg(key_t) key;
-	syscallarg(int) size;
-	syscallarg(int) shmflg;
-};
-
 struct sys_clock_gettime_args {
 	syscallarg(clockid_t) clock_id;
 	syscallarg(struct timespec *) tp;
@@ -1007,25 +980,6 @@ struct sys_msync_args {
 	syscallarg(int) flags;
 };
 
-struct compat_35_sys___semctl_args {
-	syscallarg(int) semid;
-	syscallarg(int) semnum;
-	syscallarg(int) cmd;
-	syscallarg(union semun *) arg;
-};
-
-struct compat_35_sys_shmctl_args {
-	syscallarg(int) shmid;
-	syscallarg(int) cmd;
-	syscallarg(struct shmid_ds35 *) buf;
-};
-
-struct compat_35_sys_msgctl_args {
-	syscallarg(int) msqid;
-	syscallarg(int) cmd;
-	syscallarg(struct msqid_ds35 *) buf;
-};
-
 struct sys_pipe_args {
 	syscallarg(int *) fdp;
 };
@@ -1408,9 +1362,6 @@ int	lfs_segclean(struct proc *, void *, register_t *);
 int	lfs_segwait(struct proc *, void *, register_t *);
 #else
 #endif
-int	compat_35_sys_stat(struct proc *, void *, register_t *);
-int	compat_35_sys_fstat(struct proc *, void *, register_t *);
-int	compat_35_sys_lstat(struct proc *, void *, register_t *);
 int	sys_pathconf(struct proc *, void *, register_t *);
 int	sys_fpathconf(struct proc *, void *, register_t *);
 int	sys_swapctl(struct proc *, void *, register_t *);
@@ -1442,7 +1393,6 @@ int	sys_lkmnosys(struct proc *, void *, register_t *);
 #endif	/* !LKM */
 #ifdef SYSVSEM
 int	sys_semget(struct proc *, void *, register_t *);
-int	compat_35_sys_semop(struct proc *, void *, register_t *);
 #else
 #endif
 #ifdef SYSVMSG
@@ -1454,7 +1404,6 @@ int	sys_msgrcv(struct proc *, void *, register_t *);
 #ifdef SYSVSHM
 int	sys_shmat(struct proc *, void *, register_t *);
 int	sys_shmdt(struct proc *, void *, register_t *);
-int	compat_35_sys_shmget(struct proc *, void *, register_t *);
 #else
 #endif
 int	sys_clock_gettime(struct proc *, void *, register_t *);
@@ -1468,18 +1417,6 @@ int	sys_issetugid(struct proc *, void *, register_t *);
 int	sys_lchown(struct proc *, void *, register_t *);
 int	sys_getsid(struct proc *, void *, register_t *);
 int	sys_msync(struct proc *, void *, register_t *);
-#ifdef SYSVSEM
-int	compat_35_sys___semctl(struct proc *, void *, register_t *);
-#else
-#endif
-#ifdef SYSVSHM
-int	compat_35_sys_shmctl(struct proc *, void *, register_t *);
-#else
-#endif
-#ifdef SYSVMSG
-int	compat_35_sys_msgctl(struct proc *, void *, register_t *);
-#else
-#endif
 int	sys_pipe(struct proc *, void *, register_t *);
 int	sys_fhopen(struct proc *, void *, register_t *);
 int	sys_preadv(struct proc *, void *, register_t *);