sync

8 files changed, 26 insertions, 29 deletions

diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h
index 842871806d3..1e53c5ea547 100644
--- a/sys/compat/freebsd/freebsd_syscall.h
+++ b/sys/compat/freebsd/freebsd_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscall.h,v 1.33 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: freebsd_syscall.h,v 1.34 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.31 2007/04/05 15:33:42 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.32 2007/11/28 13:47:02 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h
index 8dcd4f9e71c..f8f2e31550a 100644
--- a/sys/compat/freebsd/freebsd_syscallargs.h
+++ b/sys/compat/freebsd/freebsd_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscallargs.h,v 1.35 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: freebsd_syscallargs.h,v 1.36 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.31 2007/04/05 15:33:42 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.32 2007/11/28 13:47:02 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -195,6 +195,10 @@ struct freebsd_sys_getfh_args {
 	syscallarg(fhandle_t *) fhp;
 };
 
+struct compat_freebsd_sys_uname_args {
+	syscallarg(struct outsname *) name;
+};
+
 struct freebsd_sys_rtprio_args {
 	syscallarg(int) function;
 	syscallarg(pid_t) pid;
@@ -434,7 +438,7 @@ int	freebsd_sys_getfh(struct proc *, void *, register_t *);
 #endif
 int	compat_09_sys_getdomainname(struct proc *, void *, register_t *);
 int	compat_09_sys_setdomainname(struct proc *, void *, register_t *);
-int	compat_09_sys_uname(struct proc *, void *, register_t *);
+int	compat_freebsd_sys_uname(struct proc *, void *, register_t *);
 int	sys_sysarch(struct proc *, void *, register_t *);
 int	freebsd_sys_rtprio(struct proc *, void *, register_t *);
 #if defined(SYSVSEM) && !defined(alpha)
diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c
index 42064ff7229..404d03cbcc2 100644
--- a/sys/compat/freebsd/freebsd_syscalls.c
+++ b/sys/compat/freebsd/freebsd_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_syscalls.c,v 1.33 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: freebsd_syscalls.c,v 1.34 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.31 2007/04/05 15:33:42 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.32 2007/11/28 13:47:02 deraadt Exp 
  */
 
 char *freebsd_syscallnames[] = {
diff --git a/sys/compat/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c
index 3b6078b1691..27d0a1425b9 100644
--- a/sys/compat/freebsd/freebsd_sysent.c
+++ b/sys/compat/freebsd/freebsd_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: freebsd_sysent.c,v 1.34 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: freebsd_sysent.c,v 1.35 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.31 2007/04/05 15:33:42 tedu Exp 
+ * created from	OpenBSD: syscalls.master,v 1.32 2007/11/28 13:47:02 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -377,8 +377,8 @@ struct sysent freebsd_sysent[] = {
 	    compat_09_sys_getdomainname },	/* 162 = getdomainname */
 	{ 2, s(struct compat_09_sys_setdomainname_args), 0,
 	    compat_09_sys_setdomainname },	/* 163 = setdomainname */
-	{ 1, s(struct compat_09_sys_uname_args), 0,
-	    compat_09_sys_uname },		/* 164 = uname */
+	{ 1, s(struct compat_freebsd_sys_uname_args), 0,
+	    compat_freebsd_sys_uname },		/* 164 = uname */
 	{ 2, s(struct sys_sysarch_args), 0,
 	    sys_sysarch },			/* 165 = sysarch */
 	{ 3, s(struct freebsd_sys_rtprio_args), 0,
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 1bcbec267b0..5669a213d78 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.99 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.100 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.87 2007/11/27 18:04:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.88 2007/11/28 13:47:02 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -403,8 +403,8 @@ struct sysent sysent[] = {
 	    compat_09(sys_getdomainname) },	/* 162 = compat_09 ogetdomainname */
 	{ 2, s(struct compat_09_sys_setdomainname_args), 0,
 	    compat_09(sys_setdomainname) },	/* 163 = compat_09 osetdomainname */
-	{ 1, s(struct compat_09_sys_uname_args), 0,
-	    compat_09(sys_uname) },		/* 164 = compat_09 ouname */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 164 = unimplemented ouname */
 	{ 2, s(struct sys_sysarch_args), 0,
 	    sys_sysarch },			/* 165 = sysarch */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index aaf4c05ce06..0bf9c94c45e 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.100 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.101 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.87 2007/11/27 18:04:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.88 2007/11/28 13:47:02 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -188,7 +188,7 @@ char *syscallnames[] = {
 	"getfh",			/* 161 = getfh */
 	"compat_09_ogetdomainname",	/* 162 = compat_09 ogetdomainname */
 	"compat_09_osetdomainname",	/* 163 = compat_09 osetdomainname */
-	"compat_09_ouname",	/* 164 = compat_09 ouname */
+	"#164 (unimplemented ouname)",		/* 164 = unimplemented ouname */
 	"sysarch",			/* 165 = sysarch */
 	"#166 (unimplemented)",		/* 166 = unimplemented */
 	"#167 (unimplemented)",		/* 167 = unimplemented */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 8c16d5468c7..5ddd33cd213 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.98 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.99 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.87 2007/11/27 18:04:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.88 2007/11/28 13:47:02 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -417,8 +417,6 @@
 
 				/* 163 is compat_09 osetdomainname */
 
-				/* 164 is compat_09 ouname */
-
 /* syscall: "sysarch" ret: "int" args: "int" "void *" */
 #define	SYS_sysarch	165
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 046f0e85e11..b7c469ef634 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.100 2007/11/27 18:05:59 art Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.101 2007/11/28 13:48:31 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.87 2007/11/27 18:04:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.88 2007/11/28 13:47:02 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -719,10 +719,6 @@ struct compat_09_sys_setdomainname_args {
 	syscallarg(int) len;
 };
 
-struct compat_09_sys_uname_args {
-	syscallarg(struct outsname *) name;
-};
-
 struct sys_sysarch_args {
 	syscallarg(int) op;
 	syscallarg(void *) parms;
@@ -1408,7 +1404,6 @@ int	compat_25_sys_fstatfs(struct proc *, void *, register_t *);
 int	sys_getfh(struct proc *, void *, register_t *);
 int	compat_09_sys_getdomainname(struct proc *, void *, register_t *);
 int	compat_09_sys_setdomainname(struct proc *, void *, register_t *);
-int	compat_09_sys_uname(struct proc *, void *, register_t *);
 int	sys_sysarch(struct proc *, void *, register_t *);
 #if defined(SYSVSEM) && !defined(__LP64__)
 int	compat_10_sys_semsys(struct proc *, void *, register_t *);