Sync with previous commit of syscall.master that did not make it into the changelogs. (enable xfspioctl even when XFS is not defined)

4 files changed, 8 insertions, 20 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 3dcf59ad5d7..cb4bcbf10e4 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.32 1998/08/30 18:18:49 deraadt Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.33 1998/09/18 00:33:45 art Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.30 1998/08/30 18:18:00 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.31 1998/09/17 20:54:04 art Exp 
  */
 
 #include <sys/param.h>
@@ -510,13 +510,8 @@ struct sysent sysent[] = {
 	    sys_futimes },			/* 206 = futimes */
 	{ 1, s(struct sys_getpgid_args),
 	    sys_getpgid },			/* 207 = getpgid */
-#ifdef XFS
 	{ 5, s(struct sys_xfspioctl_args),
 	    sys_xfspioctl },			/* 208 = xfspioctl */
-#else
-	{ 0, 0,
-	    sys_nosys },			/* 208 = unimplemented xfspioctl */
-#endif
 	{ 0, 0,
 	    sys_nosys },			/* 209 = unimplemented */
 #ifdef LKM
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 3cdb4f38fb2..0516794bdae 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.32 1998/08/30 18:18:51 deraadt Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.33 1998/09/18 00:33:45 art Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.30 1998/08/30 18:18:00 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.31 1998/09/17 20:54:04 art Exp 
  */
 
 char *syscallnames[] = {
@@ -256,11 +256,7 @@ char *syscallnames[] = {
 	"undelete",			/* 205 = undelete */
 	"futimes",			/* 206 = futimes */
 	"getpgid",			/* 207 = getpgid */
-#ifdef XFS
 	"xfspioctl",			/* 208 = xfspioctl */
-#else
-	"#208 (unimplemented xfspioctl)",		/* 208 = unimplemented xfspioctl */
-#endif
 	"#209 (unimplemented)",		/* 209 = unimplemented */
 #ifdef LKM
 	"lkmnosys",			/* 210 = lkmnosys */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index d3933d096f1..3dd07248404 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.32 1998/08/30 18:18:46 deraadt Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.33 1998/09/18 00:33:46 art Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.30 1998/08/30 18:18:00 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.31 1998/09/17 20:54:04 art Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 2fb97bae0a7..8fb61f46fd9 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.33 1998/08/30 18:18:47 deraadt Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.34 1998/09/18 00:33:46 art Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.30 1998/08/30 18:18:00 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.31 1998/09/17 20:54:04 art Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -1248,10 +1248,7 @@ int	sys_munlock	__P((struct proc *, void *, register_t *));
 int	sys_undelete	__P((struct proc *, void *, register_t *));
 int	sys_futimes	__P((struct proc *, void *, register_t *));
 int	sys_getpgid	__P((struct proc *, void *, register_t *));
-#ifdef XFS
 int	sys_xfspioctl	__P((struct proc *, void *, register_t *));
-#else
-#endif
 #ifdef LKM
 int	sys_lkmnosys	__P((struct proc *, void *, register_t *));
 int	sys_lkmnosys	__P((struct proc *, void *, register_t *));