sync

4 files changed, 11 insertions, 26 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 9991bf22684..4c937d00cb4 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.116 2010/10/28 15:03:51 millert Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.117 2011/04/04 12:44:43 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.104 2010/10/28 15:02:41 millert Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.105 2011/04/04 12:44:10 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -46,12 +46,6 @@
 #define compat_35(func) sys_nosys
 #endif
 
-#ifdef COMPAT_O47
-#define compat_o47(func) __CONCAT(compat_o47_,func)
-#else
-#define compat_o47(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -718,8 +712,8 @@ struct sysent sysent[] = {
 	    sys_mlockall },			/* 271 = mlockall */
 	{ 0, 0, 0,
 	    sys_munlockall },			/* 272 = munlockall */
-	{ 3, s(struct compat_o47_sys_getpeereid_args), 0,
-	    compat_o47(sys_getpeereid) },	/* 273 = compat_o47 getpeereid */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 273 = unimplemented sys_getpeereid */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 274 = unimplemented sys_extattrctl */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 6d07f7754f7..2c421614f82 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.117 2010/10/28 15:03:51 millert Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.118 2011/04/04 12:44:43 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.104 2010/10/28 15:02:41 millert Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.105 2011/04/04 12:44:10 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -362,7 +362,7 @@ char *syscallnames[] = {
 	"kevent",			/* 270 = kevent */
 	"mlockall",			/* 271 = mlockall */
 	"munlockall",			/* 272 = munlockall */
-	"compat_o47_getpeereid",	/* 273 = compat_o47 getpeereid */
+	"#273 (unimplemented sys_getpeereid)",		/* 273 = unimplemented sys_getpeereid */
 	"#274 (unimplemented sys_extattrctl)",		/* 274 = unimplemented sys_extattrctl */
 	"#275 (unimplemented sys_extattr_set_file)",		/* 275 = unimplemented sys_extattr_set_file */
 	"#276 (unimplemented sys_extattr_get_file)",		/* 276 = unimplemented sys_extattr_get_file */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 09883418f52..c338ac745bf 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.116 2010/10/28 15:03:51 millert Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.117 2011/04/04 12:44:43 deraadt Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.104 2010/10/28 15:02:41 millert Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.105 2011/04/04 12:44:10 deraadt Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -594,8 +594,6 @@
 /* syscall: "munlockall" ret: "int" args: */
 #define	SYS_munlockall	272
 
-				/* 273 is compat_o47 getpeereid */
-
 /* syscall: "getresuid" ret: "int" args: "uid_t *" "uid_t *" "uid_t *" */
 #define	SYS_getresuid	281
 
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index e7e562c893d..6a7458d8914 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.118 2010/10/28 15:03:51 millert Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.119 2011/04/04 12:44:43 deraadt Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.104 2010/10/28 15:02:41 millert Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.105 2011/04/04 12:44:10 deraadt Exp 
  */
 
 #ifdef	syscallarg
@@ -1064,12 +1064,6 @@ struct sys_mlockall_args {
 	syscallarg(int) flags;
 };
 
-struct compat_o47_sys_getpeereid_args {
-	syscallarg(int) fdes;
-	syscallarg(uid_t *) euid;
-	syscallarg(gid_t *) egid;
-};
-
 struct sys_getresuid_args {
 	syscallarg(uid_t *) ruid;
 	syscallarg(uid_t *) euid;
@@ -1494,7 +1488,6 @@ int	sys_kqueue(struct proc *, void *, register_t *);
 int	sys_kevent(struct proc *, void *, register_t *);
 int	sys_mlockall(struct proc *, void *, register_t *);
 int	sys_munlockall(struct proc *, void *, register_t *);
-int	compat_o47_sys_getpeereid(struct proc *, void *, register_t *);
 int	sys_getresuid(struct proc *, void *, register_t *);
 int	sys_setresuid(struct proc *, void *, register_t *);
 int	sys_getresgid(struct proc *, void *, register_t *);