[src/trunk]: src/sys/compat/sunos Merge the nathanw_sa branch.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90aff89d782e
branches:  trunk
changeset: 541762:90aff89d782e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 18 08:36:15 2003 +0000

description:
Merge the nathanw_sa branch.

diffstat:

 sys/compat/sunos/sunos_ioctl.c   |   21 +-
 sys/compat/sunos/sunos_misc.c    |  269 +++++++++++++++++++++-----------------
 sys/compat/sunos/syscalls.master |    3 +-
 3 files changed, 159 insertions(+), 134 deletions(-)

diffs (truncated from 891 to 300 lines):

diff -r ec51efc405b3 -r 90aff89d782e sys/compat/sunos/sunos_ioctl.c
--- a/sys/compat/sunos/sunos_ioctl.c    Sat Jan 18 08:35:00 2003 +0000
+++ b/sys/compat/sunos/sunos_ioctl.c    Sat Jan 18 08:36:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunos_ioctl.c,v 1.42 2003/01/04 23:43:04 wiz Exp $     */
+/*     $NetBSD: sunos_ioctl.c,v 1.43 2003/01/18 08:36:15 thorpej Exp $ */
 
 /*
  * Copyright (c) 1993 Markus Wild.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.42 2003/01/04 23:43:04 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.43 2003/01/18 08:36:15 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_execfmt.h"
@@ -46,6 +46,7 @@
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/disklabel.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <miscfs/specfs/specdev.h>
@@ -402,8 +403,8 @@
 }
 
 int
-sunos_sys_ioctl(p, v, retval)
-       struct proc *p;
+sunos_sys_ioctl(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
@@ -412,6 +413,7 @@
                u_long  com;
                caddr_t data;
        } */ *uap = v;
+       struct proc *p = l->l_proc;
        struct filedesc *fdp = p->p_fd;
        struct file *fp;
        int (*ctl) __P((struct file *, u_long, caddr_t, struct proc *));
@@ -893,7 +895,7 @@
            }
 
        }
-       return (sys_ioctl(p, uap, retval));
+       return (sys_ioctl(l, uap, retval));
 }
 
 /* SunOS fcntl(2) cmds not implemented */
@@ -995,12 +997,13 @@
 };
 
 int
-sunos_sys_fcntl(p, v, retval)
-       struct proc *p;
+sunos_sys_fcntl(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_fcntl_args *uap = v;
+       struct proc *p = l->l_proc;
        long flg;
        int n, ret;
 
@@ -1044,7 +1047,7 @@
                        if (error)
                                return error;
 
-                       error = sys_fcntl(p, &fa, retval);
+                       error = sys_fcntl(l, &fa, retval);
                        if (error || SCARG(&fa, cmd) != F_GETLK)
                                return error;
 
@@ -1067,7 +1070,7 @@
                break;
        }
 
-       ret = sys_fcntl(p, uap, retval);
+       ret = sys_fcntl(l, uap, retval);
 
        switch (SCARG(uap, cmd)) {
        case F_GETFL:
diff -r ec51efc405b3 -r 90aff89d782e sys/compat/sunos/sunos_misc.c
--- a/sys/compat/sunos/sunos_misc.c     Sat Jan 18 08:35:00 2003 +0000
+++ b/sys/compat/sunos/sunos_misc.c     Sat Jan 18 08:36:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sunos_misc.c,v 1.116 2002/09/06 13:18:43 gehenna Exp $ */
+/*     $NetBSD: sunos_misc.c,v 1.117 2003/01/18 08:36:15 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.116 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.117 2003/01/18 08:36:15 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfsserver.h"
@@ -88,6 +88,7 @@
 #include <sys/wait.h>
 #include <sys/utsname.h>
 #include <sys/unistd.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 #include <sys/conf.h>
 #include <sys/socketvar.h>
@@ -111,13 +112,14 @@
 static int sunstatfs __P((struct statfs *, caddr_t));
 
 int
-sunos_sys_stime(p, v, retval)
-       struct proc *p;
+sunos_sys_stime(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_stime_args *uap = v;
        struct sys_settimeofday_args ap;
+       struct proc *p = l->l_proc;
        caddr_t sg = stackgap_init(p, 0);
        struct timeval tv, *sgtvp;
        int error;
@@ -134,28 +136,29 @@
        if (error)
                return error;
 
-       return sys_settimeofday(p, &ap, retval);
+       return sys_settimeofday(l, &ap, retval);
 }
 
 int
-sunos_sys_wait4(p, v, retval)
-       struct proc *p;
+sunos_sys_wait4(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_wait4_args *uap = v;
        if (SCARG(uap, pid) == 0)
                SCARG(uap, pid) = WAIT_ANY;
-       return (sys_wait4(p, uap, retval));
+       return (sys_wait4(l, uap, retval));
 }
 
 int
-sunos_sys_creat(p, v, retval)
-       struct proc *p;
+sunos_sys_creat(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_creat_args *uap = v;
+       struct proc *p = l->l_proc;
        struct sys_open_args ouap;
 
        caddr_t sg = stackgap_init(p, 0);
@@ -165,51 +168,54 @@
        SCARG(&ouap, flags) = O_WRONLY | O_CREAT | O_TRUNC;
        SCARG(&ouap, mode) = SCARG(uap, mode);
 
-       return (sys_open(p, &ouap, retval));
+       return (sys_open(l, &ouap, retval));
 }
 
 int
-sunos_sys_access(p, v, retval)
-       struct proc *p;
+sunos_sys_access(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_access_args *uap = v;
+       struct proc *p = l->l_proc;
        caddr_t sg = stackgap_init(p, 0);
        CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 
-       return (sys_access(p, uap, retval));
+       return (sys_access(l, uap, retval));
 }
 
 int
-sunos_sys_stat(p, v, retval)
-       struct proc *p;
+sunos_sys_stat(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_stat_args *uap = v;
+       struct proc *p = l->l_proc;
        caddr_t sg = stackgap_init(p, 0);
        CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 
-       return (compat_43_sys_stat(p, uap, retval));
+       return (compat_43_sys_stat(l, uap, retval));
 }
 
 int
-sunos_sys_lstat(p, v, retval)
-       struct proc *p;
+sunos_sys_lstat(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
        struct sunos_sys_lstat_args *uap = v;
+       struct proc *p = l->l_proc;
        caddr_t sg = stackgap_init(p, 0);
        CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 
-       return (compat_43_sys_lstat(p, uap, retval));
+       return (compat_43_sys_lstat(l, uap, retval));
 }
 
 int
-sunos_sys_execv(p, v, retval)
-       struct proc *p;
+sunos_sys_execv(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
@@ -217,6 +223,7 @@
                syscallarg(const char *) path;
                syscallarg(char **) argv;
        } */ *uap = v;
+       struct proc *p = l->l_proc;
        struct sys_execve_args ap;
        caddr_t sg;
 
@@ -227,12 +234,12 @@
        SCARG(&ap, argp) = SCARG(uap, argp);
        SCARG(&ap, envp) = NULL;
 
-       return (sys_execve(p, &ap, retval));
+       return (sys_execve(l, &ap, retval));
 }
 
 int
-sunos_sys_execve(p, v, retval)
-       struct proc *p;
+sunos_sys_execve(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
@@ -242,6 +249,7 @@
                syscallarg(char **) envp;
        } */ *uap = v;
        struct sys_execve_args ap;
+       struct proc *p = l->l_proc;
        caddr_t sg;
 
        sg = stackgap_init(p, 0);
@@ -251,12 +259,12 @@
        SCARG(&ap, argp) = SCARG(uap, argp);
        SCARG(&ap, envp) = SCARG(uap, envp);
 
-       return (sys_execve(p, &ap, retval));
+       return (sys_execve(l, &ap, retval));
 }
 
 int
-sunos_sys_omsync(p, v, retval)
-       struct proc *p;
+sunos_sys_omsync(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
@@ -267,12 +275,12 @@
        SCARG(&ouap, len) = SCARG(uap, len);
        SCARG(&ouap, flags) = SCARG(uap, flags);
 
-       return (sys___msync13(p, &ouap, retval));
+       return (sys___msync13(l, &ouap, retval));
 }
 
 int
-sunos_sys_unmount(p, v, retval)
-       struct proc *p;
+sunos_sys_unmount(l, v, retval)
+       struct lwp *l;
        void *v;
        register_t *retval;
 {
@@ -282,7 +290,7 @@
        SCARG(&ouap, path) = SCARG(uap, path);