sync

2 files changed, 19 insertions, 49 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 25594a69c65..311145fee49 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.125 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.126 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 #include <sys/param.h>
@@ -16,36 +16,6 @@
 #include <sys/event.h>
 #include <nnpfs/nnpfs_pioctl.h>
 
-#ifdef COMPAT_43
-#define compat_43(func) __CONCAT(compat_43_,func)
-#else
-#define compat_43(func) sys_nosys
-#endif
-
-#ifdef COMPAT_09
-#define compat_09(func) __CONCAT(compat_09_,func)
-#else
-#define compat_09(func) sys_nosys
-#endif
-
-#ifdef COMPAT_10
-#define compat_10(func) __CONCAT(compat_10_,func)
-#else
-#define compat_10(func) sys_nosys
-#endif
-
-#ifdef COMPAT_25
-#define compat_25(func) __CONCAT(compat_25_,func)
-#else
-#define compat_25(func) sys_nosys
-#endif
-
-#ifdef COMPAT_35
-#define compat_35(func) __CONCAT(compat_35_,func)
-#else
-#define compat_35(func) sys_nosys
-#endif
-
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -85,8 +55,8 @@ struct sysent sysent[] = {
 	    sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args), 0,
 	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct compat_25_sys_getfsstat_args), 0,
-	    compat_25(sys_getfsstat) },		/* 18 = compat_25 ogetfsstat */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 18 = obsolete getfsstat25 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 19 = obsolete olseek */
 	{ 0, 0, SY_NOLOCK | 0,
@@ -194,8 +164,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 63 = obsolete ogetkerninfo */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 64 = obsolete ogetpagesize */
-	{ 2, s(struct compat_25_sys_omsync_args), 0,
-	    compat_25(sys_omsync) },		/* 65 = compat_25 omsync */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 65 = obsolete omsync25 */
 	{ 0, 0, 0,
 	    sys_vfork },			/* 66 = vfork */
 	{ 0, 0, 0,
@@ -234,8 +204,8 @@ struct sysent sysent[] = {
 	    sys_setitimer },			/* 83 = setitimer */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 84 = obsolete owait */
-	{ 1, s(struct compat_25_sys_swapon_args), 0,
-	    compat_25(sys_swapon) },		/* 85 = compat_25 swapon */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 85 = obsolete swapon25 */
 	{ 2, s(struct sys_getitimer_args), 0,
 	    sys_getitimer },			/* 86 = getitimer */
 	{ 0, 0, 0,
@@ -383,10 +353,10 @@ struct sysent sysent[] = {
 #endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 156 = obsolete ogetdirentries */
-	{ 2, s(struct compat_25_sys_statfs_args), 0,
-	    compat_25(sys_statfs) },		/* 157 = compat_25 ostatfs */
-	{ 2, s(struct compat_25_sys_fstatfs_args), 0,
-	    compat_25(sys_fstatfs) },		/* 158 = compat_25 ostatfs */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 157 = obsolete statfs25 */
+	{ 0, 0, 0,
+	    sys_nosys },			/* 158 = obsolete fstatfs */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0, 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index f1a10b87262..f1846190a55 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.126 2011/07/08 19:19:59 tedu Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.127 2011/07/09 00:11:28 deraadt Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.113 2011/07/08 19:19:20 tedu Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.114 2011/07/09 00:10:51 deraadt Exp 
  */
 
 char *syscallnames[] = {
@@ -26,7 +26,7 @@ char *syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"compat_25_ogetfsstat",	/* 18 = compat_25 ogetfsstat */
+	"#18 (obsolete getfsstat25)",		/* 18 = obsolete getfsstat25 */
 	"#19 (obsolete olseek)",		/* 19 = obsolete olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -85,7 +85,7 @@ char *syscallnames[] = {
 	"#62 (obsolete fstat43)",		/* 62 = obsolete fstat43 */
 	"#63 (obsolete ogetkerninfo)",		/* 63 = obsolete ogetkerninfo */
 	"#64 (obsolete ogetpagesize)",		/* 64 = obsolete ogetpagesize */
-	"compat_25_omsync",	/* 65 = compat_25 omsync */
+	"#65 (obsolete omsync25)",		/* 65 = obsolete omsync25 */
 	"vfork",			/* 66 = vfork */
 	"#67 (obsolete vread)",		/* 67 = obsolete vread */
 	"#68 (obsolete vwrite)",		/* 68 = obsolete vwrite */
@@ -105,7 +105,7 @@ char *syscallnames[] = {
 	"setpgid",			/* 82 = setpgid */
 	"setitimer",			/* 83 = setitimer */
 	"#84 (obsolete owait)",		/* 84 = obsolete owait */
-	"compat_25_swapon",	/* 85 = compat_25 swapon */
+	"#85 (obsolete swapon25)",		/* 85 = obsolete swapon25 */
 	"getitimer",			/* 86 = getitimer */
 	"#87 (obsolete ogethostname)",		/* 87 = obsolete ogethostname */
 	"#88 (obsolete osethostname)",		/* 88 = obsolete osethostname */
@@ -181,8 +181,8 @@ char *syscallnames[] = {
 	"#155 (unimplemented)",		/* 155 = unimplemented */
 #endif
 	"#156 (obsolete ogetdirentries)",		/* 156 = obsolete ogetdirentries */
-	"compat_25_ostatfs",	/* 157 = compat_25 ostatfs */
-	"compat_25_ostatfs",	/* 158 = compat_25 ostatfs */
+	"#157 (obsolete statfs25)",		/* 157 = obsolete statfs25 */
+	"#158 (obsolete fstatfs)",		/* 158 = obsolete fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 	"getfh",			/* 161 = getfh */