Reran makesyscalls.sh for addition of Linux dummy mount/umount() syscalls.

Fixed OpenBSD tag damage during previous checkin.

diff --git a/sys/compat/linux/linux_syscall.h b/sys/compat/linux/linux_syscall.h
index e420b55..7fc5cd6 100644 (file)
--- a/sys/compat/linux/linux_syscall.h
+++ b/sys/compat/linux/linux_syscall.h
@@ -1,9 +1,8 @@
-/*     $OpenBSD: linux_syscall.h,v 1.3 1996/04/17 05:24:05 mickey Exp $        */
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp 
+ * created from        OpenBSD: syscalls.master,v 1.5 1996/04/28 07:38:24 etheisen Exp 
  */
 
 #define        LINUX_SYS_syscall       0
@@ -27,6 +26,8 @@
                                /* 18 is obsolete ostat */
 #define        LINUX_SYS_lseek 19
 #define        LINUX_SYS_getpid        20
+#define        LINUX_SYS_mount 21
+#define        LINUX_SYS_umount        22
 #define        LINUX_SYS_setuid        23
 #define        LINUX_SYS_getuid        24
 #define        LINUX_SYS_alarm 27

diff --git a/sys/compat/linux/linux_syscallargs.h b/sys/compat/linux/linux_syscallargs.h
index 2015106..ce7ad96 100644 (file)
--- a/sys/compat/linux/linux_syscallargs.h
+++ b/sys/compat/linux/linux_syscallargs.h
@@ -1,9 +1,8 @@
-/*     $OpenBSD: linux_syscallargs.h,v 1.4 1996/04/17 05:24:06 mickey Exp $    */
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp 
+ * created from        OpenBSD: syscalls.master,v 1.5 1996/04/28 07:38:24 etheisen Exp 
  */
 
 #define        syscallarg(x)   union { x datum; register_t pad; }
@@ -64,6 +63,18 @@ struct linux_sys_break_args {
        syscallarg(char *) nsize;
 };
 
+struct linux_sys_mount_args {
+       syscallarg(char *) specialfile;
+       syscallarg(char *) dir;
+       syscallarg(char *) filesystemtype;
+       syscallarg(long) rwflag;
+       syscallarg(void *) data;
+};
+
+struct linux_sys_umount_args {
+       syscallarg(char *) specialfile;
+};
+
 struct linux_sys_alarm_args {
        syscallarg(unsigned int) secs;
 };
@@ -339,6 +350,8 @@ int linux_sys_chown __P((struct proc *, void *, register_t *));
 int    linux_sys_break __P((struct proc *, void *, register_t *));
 int    compat_43_sys_lseek     __P((struct proc *, void *, register_t *));
 int    sys_getpid      __P((struct proc *, void *, register_t *));
+int    linux_sys_mount __P((struct proc *, void *, register_t *));
+int    linux_sys_umount        __P((struct proc *, void *, register_t *));
 int    sys_setuid      __P((struct proc *, void *, register_t *));
 int    sys_getuid      __P((struct proc *, void *, register_t *));
 int    linux_sys_alarm __P((struct proc *, void *, register_t *));

diff --git a/sys/compat/linux/linux_syscalls.c b/sys/compat/linux/linux_syscalls.c
index b1cdcfb..be17ca2 100644 (file)
--- a/sys/compat/linux/linux_syscalls.c
+++ b/sys/compat/linux/linux_syscalls.c
@@ -1,9 +1,8 @@
-/*     $OpenBSD: linux_syscalls.c,v 1.3 1996/04/17 05:24:07 mickey Exp $       */
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp 
+ * created from        OpenBSD: syscalls.master,v 1.5 1996/04/28 07:38:24 etheisen Exp 
  */
 
 char *linux_syscallnames[] = {
@@ -28,8 +27,8 @@ char *linux_syscallnames[] = {
        "#18 (obsolete ostat)",         /* 18 = obsolete ostat */
        "lseek",                        /* 19 = lseek */
        "getpid",                       /* 20 = getpid */
-       "#21 (unimplemented mount)",            /* 21 = unimplemented mount */
-       "#22 (unimplemented umount)",           /* 22 = unimplemented umount */
+       "mount",                        /* 21 = mount */
+       "umount",                       /* 22 = umount */
        "setuid",                       /* 23 = setuid */
        "getuid",                       /* 24 = getuid */
        "#25 (unimplemented stime)",            /* 25 = unimplemented stime */

diff --git a/sys/compat/linux/linux_sysent.c b/sys/compat/linux/linux_sysent.c
index f6b9757..6ae863f 100644 (file)
--- a/sys/compat/linux/linux_sysent.c
+++ b/sys/compat/linux/linux_sysent.c
@@ -1,9 +1,8 @@
-/*     $OpenBSD: linux_sysent.c,v 1.4 1996/04/17 05:24:08 mickey Exp $ */
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from        NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp 
+ * created from        OpenBSD: syscalls.master,v 1.5 1996/04/28 07:38:24 etheisen Exp 
  */
 
 #include <sys/param.h>
@@ -61,10 +60,10 @@ struct sysent linux_sysent[] = {
            compat_43_sys_lseek },              /* 19 = lseek */
        { 0, 0,
            sys_getpid },                       /* 20 = getpid */
-       { 0, 0,
-           sys_nosys },                        /* 21 = unimplemented mount */
-       { 0, 0,
-           sys_nosys },                        /* 22 = unimplemented umount */
+       { 5, s(struct linux_sys_mount_args),
+           linux_sys_mount },                  /* 21 = mount */
+       { 1, s(struct linux_sys_umount_args),
+           linux_sys_umount },                 /* 22 = umount */
        { 1, s(struct sys_setuid_args),
            sys_setuid },                       /* 23 = setuid */
        { 0, 0,

diff --git a/sys/compat/linux/syscalls.master b/sys/compat/linux/syscalls.master
index 77884b8..792855b 100644 (file)
--- a/sys/compat/linux/syscalls.master
+++ b/sys/compat/linux/syscalls.master
@@ -1,4 +1,4 @@
-       $OpenBSD: syscalls.master,v 1.5 1996/04/28 07:38:24 etheisen Exp $
+       $OpenBSD: syscalls.master,v 1.6 1996/04/28 07:53:18 etheisen Exp $
 ;      $NetBSD: syscalls.master,v 1.15 1995/12/18 14:35:10 fvdl Exp $
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93