sync

2 files changed, 22 insertions, 16 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index a483c457cc9..bf353961d3c 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.127 2011/07/09 00:18:15 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.128 2011/07/09 05:32:25 matthew Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.115 2011/07/09 00:18:06 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.116 2011/07/09 05:31:26 matthew Exp 
  */
 
 #include <sys/param.h>
@@ -16,6 +16,12 @@
 #include <sys/event.h>
 #include <nnpfs/nnpfs_pioctl.h>
 
+#ifdef COMPAT_48
+#define compat_48(func) __CONCAT(compat_48_,func)
+#else
+#define compat_48(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -140,8 +146,8 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_sigpending },			/* 52 = sigpending */
-	{ 2, s(struct sys_osigaltstack_args), 0,
-	    sys_osigaltstack },			/* 53 = osigaltstack */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 53 = obsolete osigaltstack */
 	{ 3, s(struct sys_ioctl_args), 0,
 	    sys_ioctl },			/* 54 = ioctl */
 	{ 1, s(struct sys_reboot_args), 0,
@@ -172,10 +178,10 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 67 = obsolete vread */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 68 = obsolete vwrite */
-	{ 1, s(struct sys_sbrk_args), 0,
-	    sys_sbrk },				/* 69 = sbrk */
-	{ 1, s(struct sys_sstk_args), 0,
-	    sys_sstk },				/* 70 = sstk */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 69 = obsolete sbrk */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 70 = obsolete sstk */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 71 = obsolete ommap */
 	{ 0, 0, 0,
@@ -442,8 +448,8 @@ struct sysent sysent[] = {
 	    sys_getrlimit },			/* 194 = getrlimit */
 	{ 2, s(struct sys_setrlimit_args), 0,
 	    sys_setrlimit },			/* 195 = setrlimit */
-	{ 4, s(struct sys_ogetdirentries_args), 0,
-	    sys_ogetdirentries },		/* 196 = ogetdirentries */
+	{ 4, s(struct compat_48_sys_getdirentries_args), 0,
+	    compat_48(sys_getdirentries) },	/* 196 = compat_48 getdirentries */
 	{ 7, s(struct sys_mmap_args), 0,
 	    sys_mmap },				/* 197 = mmap */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index c8676c0c5c0..b68d95f0d17 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.128 2011/07/09 00:18:15 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.129 2011/07/09 05:32:25 matthew Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.115 2011/07/09 00:18:06 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.116 2011/07/09 05:31:26 matthew Exp 
  */
 
 char *syscallnames[] = {
@@ -73,7 +73,7 @@ char *syscallnames[] = {
 	"#51 (unimplemented acct)",		/* 51 = unimplemented acct */
 #endif
 	"sigpending",			/* 52 = sigpending */
-	"osigaltstack",			/* 53 = osigaltstack */
+	"#53 (obsolete osigaltstack)",		/* 53 = obsolete osigaltstack */
 	"ioctl",			/* 54 = ioctl */
 	"reboot",			/* 55 = reboot */
 	"revoke",			/* 56 = revoke */
@@ -89,8 +89,8 @@ char *syscallnames[] = {
 	"vfork",			/* 66 = vfork */
 	"#67 (obsolete vread)",		/* 67 = obsolete vread */
 	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
-	"sbrk",			/* 69 = sbrk */
-	"sstk",			/* 70 = sstk */
+	"#69 (obsolete sbrk)",		/* 69 = obsolete sbrk */
+	"#70 (obsolete sstk)",		/* 70 = obsolete sstk */
 	"#71 (obsolete ommap)",		/* 71 = obsolete ommap */
 	"#72 (obsolete vadvise)",		/* 72 = obsolete vadvise */
 	"munmap",			/* 73 = munmap */
@@ -227,7 +227,7 @@ char *syscallnames[] = {
 	"swapctl",			/* 193 = swapctl */
 	"getrlimit",			/* 194 = getrlimit */
 	"setrlimit",			/* 195 = setrlimit */
-	"ogetdirentries",			/* 196 = ogetdirentries */
+	"compat_48_getdirentries",	/* 196 = compat_48 getdirentries */
 	"mmap",			/* 197 = mmap */
 	"__syscall",			/* 198 = __syscall */
 	"lseek",			/* 199 = lseek */