sync

4 files changed, 20 insertions, 75 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index cfbd7db4cf7..ad35937bd78 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.133 2012/04/12 11:10:07 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.134 2012/04/12 11:17:16 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.121 2012/04/12 11:07:19 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -413,25 +413,14 @@ struct sysent sysent[] = {
 	    sys_setegid },			/* 182 = setegid */
 	{ 1, s(struct sys_seteuid_args), 0,
 	    sys_seteuid },			/* 183 = seteuid */
-#ifdef LFS
-	{ 3, s(struct lfs_bmapv_args), 0,
-	    lfs_bmapv },			/* 184 = lfs_bmapv */
-	{ 3, s(struct lfs_markv_args), 0,
-	    lfs_markv },			/* 185 = lfs_markv */
-	{ 2, s(struct lfs_segclean_args), 0,
-	    lfs_segclean },			/* 186 = lfs_segclean */
-	{ 2, s(struct lfs_segwait_args), 0,
-	    lfs_segwait },			/* 187 = lfs_segwait */
-#else
 	{ 0, 0, 0,
-	    sys_nosys },			/* 184 = unimplemented */
+	    sys_nosys },			/* 184 = obsolete lfs_bmapv */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 185 = unimplemented */
+	    sys_nosys },			/* 185 = obsolete lfs_markv */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 186 = unimplemented */
+	    sys_nosys },			/* 186 = obsolete lfs_segclean */
 	{ 0, 0, 0,
-	    sys_nosys },			/* 187 = unimplemented */
-#endif
+	    sys_nosys },			/* 187 = obsolete lfs_segwait */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 188 = obsolete stat35 */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index fcab62513a2..4e992c33b96 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.134 2012/04/12 11:10:07 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.135 2012/04/12 11:17:16 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.121 2012/04/12 11:07:19 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -208,17 +208,10 @@ char *syscallnames[] = {
 	"setgid",			/* 181 = setgid */
 	"setegid",			/* 182 = setegid */
 	"seteuid",			/* 183 = seteuid */
-#ifdef LFS
-	"lfs_bmapv",			/* 184 = lfs_bmapv */
-	"lfs_markv",			/* 185 = lfs_markv */
-	"lfs_segclean",			/* 186 = lfs_segclean */
-	"lfs_segwait",			/* 187 = lfs_segwait */
-#else
-	"#184 (unimplemented)",		/* 184 = unimplemented */
-	"#185 (unimplemented)",		/* 185 = unimplemented */
-	"#186 (unimplemented)",		/* 186 = unimplemented */
-	"#187 (unimplemented)",		/* 187 = unimplemented */
-#endif
+	"#184 (obsolete lfs_bmapv)",		/* 184 = obsolete lfs_bmapv */
+	"#185 (obsolete lfs_markv)",		/* 185 = obsolete lfs_markv */
+	"#186 (obsolete lfs_segclean)",		/* 186 = obsolete lfs_segclean */
+	"#187 (obsolete lfs_segwait)",		/* 187 = obsolete lfs_segwait */
 	"#188 (obsolete stat35)",		/* 188 = obsolete stat35 */
 	"#189 (obsolete fstat35)",		/* 189 = obsolete fstat35 */
 	"#190 (obsolete lstat35)",		/* 190 = obsolete lstat35 */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 4f0bd51d0d9..e95da40786a 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.133 2012/04/12 11:10:07 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.134 2012/04/12 11:17:16 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.121 2012/04/12 11:07:19 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -390,18 +390,10 @@
 /* syscall: "seteuid" ret: "int" args: "uid_t" */
 #define	SYS_seteuid	183
 
-/* syscall: "lfs_bmapv" ret: "int" args: "fsid_t *" "struct block_info *" "int" */
-#define	SYS_lfs_bmapv	184
-
-/* syscall: "lfs_markv" ret: "int" args: "fsid_t *" "struct block_info *" "int" */
-#define	SYS_lfs_markv	185
-
-/* syscall: "lfs_segclean" ret: "int" args: "fsid_t *" "u_long" */
-#define	SYS_lfs_segclean	186
-
-/* syscall: "lfs_segwait" ret: "int" args: "fsid_t *" "struct timeval *" */
-#define	SYS_lfs_segwait	187
-
+				/* 184 is obsolete lfs_bmapv */
+				/* 185 is obsolete lfs_markv */
+				/* 186 is obsolete lfs_segclean */
+				/* 187 is obsolete lfs_segwait */
 				/* 188 is obsolete stat35 */
 				/* 189 is obsolete fstat35 */
 				/* 190 is obsolete lstat35 */
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 2c94e279551..bb18caa0bbe 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.135 2012/04/12 11:10:07 deraadt Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.136 2012/04/12 11:17:16 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.121 2012/04/12 11:07:19 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -540,28 +540,6 @@ struct sys_seteuid_args {
 	syscallarg(uid_t) euid;
 };
 
-struct lfs_bmapv_args {
-	syscallarg(fsid_t *) fsidp;
-	syscallarg(struct block_info *) blkiov;
-	syscallarg(int) blkcnt;
-};
-
-struct lfs_markv_args {
-	syscallarg(fsid_t *) fsidp;
-	syscallarg(struct block_info *) blkiov;
-	syscallarg(int) blkcnt;
-};
-
-struct lfs_segclean_args {
-	syscallarg(fsid_t *) fsidp;
-	syscallarg(u_long) segment;
-};
-
-struct lfs_segwait_args {
-	syscallarg(fsid_t *) fsidp;
-	syscallarg(struct timeval *) tv;
-};
-
 struct sys_pathconf_args {
 	syscallarg(const char *) path;
 	syscallarg(int) name;
@@ -1178,13 +1156,6 @@ int	sys_pwrite(struct proc *, void *, register_t *);
 int	sys_setgid(struct proc *, void *, register_t *);
 int	sys_setegid(struct proc *, void *, register_t *);
 int	sys_seteuid(struct proc *, void *, register_t *);
-#ifdef LFS
-int	lfs_bmapv(struct proc *, void *, register_t *);
-int	lfs_markv(struct proc *, void *, register_t *);
-int	lfs_segclean(struct proc *, void *, register_t *);
-int	lfs_segwait(struct proc *, void *, register_t *);
-#else
-#endif
 int	sys_pathconf(struct proc *, void *, register_t *);
 int	sys_fpathconf(struct proc *, void *, register_t *);
 int	sys_swapctl(struct proc *, void *, register_t *);