sync

8 files changed, 22 insertions, 29 deletions

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index 9315b17a29b..ce406a2c5a2 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.60 2011/07/07 06:17:06 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscall.h,v 1.61 2011/07/08 05:03:42 matthew Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.57 2011/07/07 06:15:47 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.58 2011/07/08 05:01:27 matthew Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index 6bc41c4d2a5..930a3c1599d 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.62 2011/07/07 06:17:06 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscallargs.h,v 1.63 2011/07/08 05:03:42 matthew Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.57 2011/07/07 06:15:47 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.58 2011/07/08 05:01:27 matthew Exp 
  */
 
 #ifdef	syscallarg
@@ -138,10 +138,6 @@ struct linux_sys_rmdir_args {
 	syscallarg(char *) path;
 };
 
-struct linux_sys_pipe_args {
-	syscallarg(int *) pfds;
-};
-
 struct linux_sys_times_args {
 	syscallarg(struct times *) tms;
 };
@@ -634,7 +630,7 @@ int	linux_sys_rename(struct proc *, void *, register_t *);
 int	linux_sys_mkdir(struct proc *, void *, register_t *);
 int	linux_sys_rmdir(struct proc *, void *, register_t *);
 int	sys_dup(struct proc *, void *, register_t *);
-int	linux_sys_pipe(struct proc *, void *, register_t *);
+int	sys_pipe(struct proc *, void *, register_t *);
 int	linux_sys_times(struct proc *, void *, register_t *);
 int	linux_sys_prof(struct proc *, void *, register_t *);
 int	linux_sys_brk(struct proc *, void *, register_t *);
diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index a1ad85aee58..0da4957ff4c 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.60 2011/07/07 06:17:06 pirofti Exp $	*/
+/*	$OpenBSD: linux_syscalls.c,v 1.61 2011/07/08 05:03:42 matthew Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.57 2011/07/07 06:15:47 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.58 2011/07/08 05:01:27 matthew Exp 
  */
 
 char *linux_syscallnames[] = {
diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index ac8a6d29f21..90088afee05 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.61 2011/07/07 06:17:06 pirofti Exp $	*/
+/*	$OpenBSD: linux_sysent.c,v 1.62 2011/07/08 05:03:42 matthew Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.57 2011/07/07 06:15:47 pirofti Exp 
+ * created from	OpenBSD: syscalls.master,v 1.58 2011/07/08 05:01:27 matthew Exp 
  */
 
 #include <sys/param.h>
@@ -110,8 +110,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_rmdir },			/* 40 = rmdir */
 	{ 1, s(struct sys_dup_args), 0,
 	    sys_dup },				/* 41 = dup */
-	{ 1, s(struct linux_sys_pipe_args), 0,
-	    linux_sys_pipe },			/* 42 = pipe */
+	{ 1, s(struct sys_pipe_args), 0,
+	    sys_pipe },				/* 42 = pipe */
 	{ 1, s(struct linux_sys_times_args), 0,
 	    linux_sys_times },			/* 43 = times */
 	{ 0, 0, 0,
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 1030881af56..e5f221b986a 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.123 2011/07/07 23:46:46 matthew Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.124 2011/07/08 05:02:49 matthew Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.111 2011/07/07 23:45:00 matthew Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.112 2011/07/08 05:01:27 matthew Exp 
  */
 
 #include <sys/param.h>
@@ -139,7 +139,7 @@ struct sysent sysent[] = {
 	{ 1, s(struct sys_dup_args), 0,
 	    sys_dup },				/* 41 = dup */
 	{ 0, 0, 0,
-	    sys_opipe },			/* 42 = opipe */
+	    sys_nosys },			/* 42 = obsolete opipe */
 	{ 0, 0, 0,
 	    sys_getegid },			/* 43 = getegid */
 	{ 4, s(struct sys_profil_args), 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 9b92618a1b2..44934706c52 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.124 2011/07/07 23:46:46 matthew Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.125 2011/07/08 05:02:49 matthew Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.111 2011/07/07 23:45:00 matthew Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.112 2011/07/08 05:01:27 matthew Exp 
  */
 
 char *syscallnames[] = {
@@ -54,7 +54,7 @@ char *syscallnames[] = {
 	"getppid",			/* 39 = getppid */
 	"#40 (obsolete lstat43)",		/* 40 = obsolete lstat43 */
 	"dup",			/* 41 = dup */
-	"opipe",			/* 42 = opipe */
+	"#42 (obsolete opipe)",		/* 42 = obsolete opipe */
 	"getegid",			/* 43 = getegid */
 	"profil",			/* 44 = profil */
 #ifdef KTRACE
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 6c035a8825e..67ad9aeaf96 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.123 2011/07/07 23:46:46 matthew Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.124 2011/07/08 05:02:49 matthew Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.111 2011/07/07 23:45:00 matthew Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.112 2011/07/08 05:01:27 matthew Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -122,9 +122,7 @@
 /* syscall: "dup" ret: "int" args: "int" */
 #define	SYS_dup	41
 
-/* syscall: "opipe" ret: "int" args: */
-#define	SYS_opipe	42
-
+				/* 42 is obsolete opipe */
 /* syscall: "getegid" ret: "gid_t" args: */
 #define	SYS_getegid	43
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 2f5cee01ee5..977cbbac7ce 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.125 2011/07/07 23:46:46 matthew Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.126 2011/07/08 05:02:49 matthew Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.111 2011/07/07 23:45:00 matthew Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.112 2011/07/08 05:01:27 matthew Exp 
  */
 
 #ifdef	syscallarg
@@ -1155,7 +1155,6 @@ int	sys_sync(struct proc *, void *, register_t *);
 int	sys_kill(struct proc *, void *, register_t *);
 int	sys_getppid(struct proc *, void *, register_t *);
 int	sys_dup(struct proc *, void *, register_t *);
-int	sys_opipe(struct proc *, void *, register_t *);
 int	sys_getegid(struct proc *, void *, register_t *);
 int	sys_profil(struct proc *, void *, register_t *);
 #ifdef KTRACE