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

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

details:   https://anonhg.NetBSD.org/src/rev/de85ee5b1e95
branches:  trunk
changeset: 541748:de85ee5b1e95
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jan 18 07:44:50 2003 +0000

description:
Merge the nathanw_sa branch.

diffstat:

 sys/compat/irix/irix_fcntl.c      |   5 +++--
 sys/compat/irix/irix_signal.c     |  18 +++++++++---------
 sys/compat/irix/irix_stat.c       |   5 +++--
 sys/compat/irix/irix_swap.c       |   5 +++--
 sys/compat/irix/irix_syssgi.c     |   5 +++--
 sys/compat/irix/irix_systeminfo.c |   5 +++--
 sys/compat/irix/syscalls.master   |   3 ++-
 7 files changed, 26 insertions(+), 20 deletions(-)

diffs (214 lines):

diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_fcntl.c
--- a/sys/compat/irix/irix_fcntl.c      Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_fcntl.c      Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_fcntl.c,v 1.10 2002/09/06 13:18:43 gehenna Exp $ */
+/*     $NetBSD: irix_fcntl.c,v 1.11 2003/01/18 07:44:50 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.10 2002/09/06 13:18:43 gehenna Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_fcntl.c,v 1.11 2003/01/18 07:44:50 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -51,6 +51,7 @@
 #include <sys/filedesc.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <miscfs/specfs/specdev.h>
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_signal.c
--- a/sys/compat/irix/irix_signal.c     Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_signal.c     Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_signal.c,v 1.22 2002/09/25 19:39:16 manu Exp $ */
+/*     $NetBSD: irix_signal.c,v 1.23 2003/01/18 07:44:51 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.22 2002/09/25 19:39:16 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.23 2003/01/18 07:44:51 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -265,7 +265,7 @@
        sigset_t *mask;
        u_long code;
 {
-       struct proc *p = curproc;
+       struct proc *p = curlwp;
        void *sp;
        struct frame *f;
        int onstack;
@@ -423,7 +423,7 @@
        scp->isc_ownedfp = p->p_md.md_flags & MDP_FPUSED;
        if (scp->isc_ownedfp) {
                /* if FPU has current state, save it first */
-               if (p == fpcurproc)
+               if (p == fpcurlwp)
                        savefpregs(p);
                (void)memcpy(&scp->isc_fpregs, &p->p_addr->u_pcb.pcb_fpregs,
                    sizeof(scp->isc_fpregs));
@@ -473,7 +473,7 @@
 #ifndef SOFTFLOAT
        if (p->p_md.md_flags & MDP_FPUSED) {
                /* if FPU has current state, save it first */
-               if (p == fpcurproc)
+               if (p == fpcurlwp)
                        savefpregs(p);
                (void)memcpy(&ucp->iuc_mcontext.svr4___fpregs, 
                    &p->p_addr->u_pcb.pcb_fpregs, 
@@ -591,8 +591,8 @@
 #ifndef SOFTFLOAT
                /* Disable the FPU to fault in FP registers. */
                f->f_regs[SR] &= ~MIPS_SR_COP_1_BIT;
-               if (p == fpcurproc) 
-                       fpcurproc = (struct proc *)0;
+               if (p == fpcurlwp) 
+                       fpcurlwp = (struct proc *)0;
                (void)memcpy(&p->p_addr->u_pcb.pcb_fpregs, 
                    &ucp->iuc_mcontext.svr4___fpregs,
                    sizeof(p->p_addr->u_pcb.pcb_fpregs));
@@ -657,8 +657,8 @@
        if (scp->isc_ownedfp) {
                /* Disable the FPU to fault in FP registers. */
                f->f_regs[SR] &= ~MIPS_SR_COP_1_BIT;
-               if (p == fpcurproc) 
-                       fpcurproc = (struct proc *)0;
+               if (p == fpcurlwp) 
+                       fpcurlwp = (struct proc *)0;
                (void)memcpy(&p->p_addr->u_pcb.pcb_fpregs, &scp->isc_fpregs,
                    sizeof(scp->isc_fpregs));
                p->p_addr->u_pcb.pcb_fpregs.r_regs[32] = scp->isc_fpc_csr;
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_stat.c
--- a/sys/compat/irix/irix_stat.c       Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_stat.c       Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_stat.c,v 1.5 2002/03/16 20:43:52 christos Exp $ */
+/*     $NetBSD: irix_stat.c,v 1.6 2003/01/18 07:44:51 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.5 2002/03/16 20:43:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_stat.c,v 1.6 2003/01/18 07:44:51 thorpej Exp $");
 
 #include <sys/errno.h>
 #include <sys/types.h>
@@ -48,6 +48,7 @@
 #include <sys/stdint.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <compat/common/compat_util.h>
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_swap.c
--- a/sys/compat/irix/irix_swap.c       Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_swap.c       Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_swap.c,v 1.7 2002/03/29 09:06:54 manu Exp $ */
+/*     $NetBSD: irix_swap.c,v 1.8 2003/01/18 07:44:51 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.7 2002/03/29 09:06:54 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_swap.c,v 1.8 2003/01/18 07:44:51 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h> 
@@ -49,6 +49,7 @@
 #include <sys/swap.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <uvm/uvm_page.h>
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_syssgi.c
--- a/sys/compat/irix/irix_syssgi.c     Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_syssgi.c     Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_syssgi.c,v 1.33 2002/11/30 12:28:26 jdolecek Exp $ */
+/*     $NetBSD: irix_syssgi.c,v 1.34 2003/01/18 07:44:51 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.33 2002/11/30 12:28:26 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_syssgi.c,v 1.34 2003/01/18 07:44:51 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ddb.h"
@@ -65,6 +65,7 @@
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/mount.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <uvm/uvm_extern.h>
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/irix_systeminfo.c
--- a/sys/compat/irix/irix_systeminfo.c Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/irix_systeminfo.c Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: irix_systeminfo.c,v 1.5 2002/11/09 09:03:58 manu Exp $ */
+/*     $NetBSD: irix_systeminfo.c,v 1.6 2003/01/18 07:44:52 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.5 2002/11/09 09:03:58 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irix_systeminfo.c,v 1.6 2003/01/18 07:44:52 thorpej Exp $");
 
 #include <sys/types.h>
 #include <sys/signal.h>
@@ -47,6 +47,7 @@
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <compat/common/compat_util.h>
diff -r 2e948fb005d8 -r de85ee5b1e95 sys/compat/irix/syscalls.master
--- a/sys/compat/irix/syscalls.master   Sat Jan 18 07:41:34 2003 +0000
+++ b/sys/compat/irix/syscalls.master   Sat Jan 18 07:44:50 2003 +0000
@@ -1,4 +1,4 @@
-       $NetBSD: syscalls.master,v 1.46 2002/10/05 23:17:30 manu Exp $
+       $NetBSD: syscalls.master,v 1.47 2003/01/18 07:44:52 thorpej Exp $
 
 ;      @(#)syscalls.master     8.1 (Berkeley) 7/19/93
 
@@ -43,6 +43,7 @@
 #include <sys/mount.h>
 #include <sys/poll.h>
 #include <sys/ioctl_compat.h>
+#include <sys/sa.h>
 #include <sys/syscallargs.h>
 
 #include <compat/svr4/svr4_types.h>