sync

4 files changed, 15 insertions, 9 deletions

diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h
index cd6a6b688f0..d7a7c06ff75 100644
--- a/sys/compat/freebsd/freebsd_syscall.h
+++ b/sys/compat/freebsd/freebsd_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/11/13 07:27:03 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1997/11/13 07:35:38 deraadt Exp 
  */
 
 #define	FREEBSD_SYS_syscall	0
@@ -210,7 +210,7 @@
 #define	FREEBSD_SYS_nanosleep	240
 #define	FREEBSD_SYS_minherit	250
 #define	FREEBSD_SYS_rfork	251
-#define	FREEBSD_SYS_poll	252
+#define	FREEBSD_SYS_poll2	252
 #define	FREEBSD_SYS_issetugid	253
 #define	FREEBSD_SYS_lchown	254
 #define	FREEBSD_SYS_MAXSYSCALL	255
diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h
index 98acbd54c81..1ad3cdb2432 100644
--- a/sys/compat/freebsd/freebsd_syscallargs.h
+++ b/sys/compat/freebsd/freebsd_syscallargs.h
@@ -2,7 +2,7 @@
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/11/13 07:27:03 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1997/11/13 07:35:38 deraadt Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -197,6 +197,12 @@ struct freebsd_sys_undelete_args {
 	syscallarg(char *) path;
 };
 
+struct freebsd_sys_poll2_args {
+	syscallarg(struct pollfd *) fds;
+	syscallarg(unsigned long) nfds;
+	syscallarg(int) timeout;
+};
+
 /*
  * System call prototypes.
  */
@@ -433,6 +439,6 @@ int	sys_shmget	__P((struct proc *, void *, register_t *));
 int	sys_nanosleep	__P((struct proc *, void *, register_t *));
 int	sys_minherit	__P((struct proc *, void *, register_t *));
 int	sys_rfork	__P((struct proc *, void *, register_t *));
-int	sys_poll	__P((struct proc *, void *, register_t *));
+int	freebsd_sys_poll2	__P((struct proc *, void *, register_t *));
 int	sys_issetugid	__P((struct proc *, void *, register_t *));
 int	sys_lchown	__P((struct proc *, void *, register_t *));
diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c
index 15d1b0fe9f9..373c339b621 100644
--- a/sys/compat/freebsd/freebsd_syscalls.c
+++ b/sys/compat/freebsd/freebsd_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/11/13 07:27:03 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1997/11/13 07:35:38 deraadt Exp 
  */
 
 char *freebsd_syscallnames[] = {
@@ -318,7 +318,7 @@ char *freebsd_syscallnames[] = {
 	"#249 (unimplemented)",		/* 249 = unimplemented */
 	"minherit",			/* 250 = minherit */
 	"rfork",			/* 251 = rfork */
-	"poll",			/* 252 = poll */
+	"poll2",			/* 252 = poll2 */
 	"issetugid",			/* 253 = issetugid */
 	"lchown",			/* 254 = lchown */
 };
diff --git a/sys/compat/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c
index c7d40d4a676..35a0faa7218 100644
--- a/sys/compat/freebsd/freebsd_sysent.c
+++ b/sys/compat/freebsd/freebsd_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.6 1997/11/13 07:27:03 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.7 1997/11/13 07:35:38 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -604,8 +604,8 @@ struct sysent freebsd_sysent[] = {
 	    sys_minherit },			/* 250 = minherit */
 	{ 1, s(struct sys_rfork_args),
 	    sys_rfork },			/* 251 = rfork */
-	{ 3, s(struct sys_poll_args),
-	    sys_poll },				/* 252 = poll */
+	{ 3, s(struct freebsd_sys_poll2_args),
+	    freebsd_sys_poll2 },		/* 252 = poll2 */
 	{ 0, 0,
 	    sys_issetugid },			/* 253 = issetugid */
 	{ 3, s(struct sys_lchown_args),