sync

4 files changed, 12 insertions, 19 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index ad35937bd78..68d815c1ad7 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.134 2012/04/12 11:17:16 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.135 2012/04/12 12:33:47 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.123 2012/04/12 12:33:03 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -597,8 +597,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 249 = unimplemented */
 	{ 3, s(struct sys_minherit_args), 0,
 	    sys_minherit },			/* 250 = minherit */
-	{ 1, s(struct sys_rfork_args), 0,
-	    sys_rfork },			/* 251 = rfork */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 251 = obsolete rfork */
 	{ 3, s(struct sys_poll_args), 0,
 	    sys_poll },				/* 252 = poll */
 	{ 0, 0, SY_NOLOCK | 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 4e992c33b96..0f6f44b01d5 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.135 2012/04/12 11:17:16 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.136 2012/04/12 12:33:47 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.123 2012/04/12 12:33:03 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -306,7 +306,7 @@ char *syscallnames[] = {
 	"#248 (unimplemented)",		/* 248 = unimplemented */
 	"#249 (unimplemented)",		/* 249 = unimplemented */
 	"minherit",			/* 250 = minherit */
-	"rfork",			/* 251 = rfork */
+	"#251 (obsolete rfork)",		/* 251 = obsolete rfork */
 	"poll",			/* 252 = poll */
 	"issetugid",			/* 253 = issetugid */
 	"lchown",			/* 254 = lchown */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index e95da40786a..d12d560bba9 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.134 2012/04/12 11:17:16 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.135 2012/04/12 12:33:47 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.123 2012/04/12 12:33:03 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -483,9 +483,7 @@
 /* syscall: "minherit" ret: "int" args: "void *" "size_t" "int" */
 #define	SYS_minherit	250
 
-/* syscall: "rfork" ret: "int" args: "int" */
-#define	SYS_rfork	251
-
+				/* 251 is obsolete rfork */
 /* syscall: "poll" ret: "int" args: "struct pollfd *" "u_int" "int" */
 #define	SYS_poll	252
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index bb18caa0bbe..d5e747005d9 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.136 2012/04/12 11:17:16 deraadt Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.137 2012/04/12 12:33:47 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.122 2012/04/12 11:16:24 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.123 2012/04/12 12:33:03 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -700,10 +700,6 @@ struct sys_minherit_args {
 	syscallarg(int) inherit;
 };
 
-struct sys_rfork_args {
-	syscallarg(int) flags;
-};
-
 struct sys_poll_args {
 	syscallarg(struct pollfd *) fds;
 	syscallarg(u_int) nfds;
@@ -1205,7 +1201,6 @@ int	sys_clock_settime(struct proc *, void *, register_t *);
 int	sys_clock_getres(struct proc *, void *, register_t *);
 int	sys_nanosleep(struct proc *, void *, register_t *);
 int	sys_minherit(struct proc *, void *, register_t *);
-int	sys_rfork(struct proc *, void *, register_t *);
 int	sys_poll(struct proc *, void *, register_t *);
 int	sys_issetugid(struct proc *, void *, register_t *);
 int	sys_lchown(struct proc *, void *, register_t *);