[src/trunk]: src/sys/arch/mips Put signal posting back in userret() for now; ...

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

details:   https://anonhg.NetBSD.org/src/rev/8ad5f5378059
branches:  trunk
changeset: 502219:8ad5f5378059
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Jan 14 00:39:48 2001 +0000

description:
Put signal posting back in userret() for now; for it to work
properly, we need to make astpending a per-process variable.

Pointed out by mycroft.

diffstat:

 sys/arch/mips/include/userret.h |   9 ++++++++-
 sys/arch/mips/mips/trap.c       |  10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diffs (75 lines):

diff -r 88c4d8221cea -r 8ad5f5378059 sys/arch/mips/include/userret.h
--- a/sys/arch/mips/include/userret.h   Sun Jan 14 00:35:53 2001 +0000
+++ b/sys/arch/mips/include/userret.h   Sun Jan 14 00:39:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: userret.h,v 1.2 2001/01/14 00:10:28 thorpej Exp $      */
+/*     $NetBSD: userret.h,v 1.3 2001/01/14 00:39:49 thorpej Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -48,6 +48,13 @@
 static __inline void
 userret(struct proc *p)
 {
+#if 1 /* XXX Need to make astpending per-process */
+       int sig;
+
+       /* Take pending signals. */
+       while ((sig = CURSIG(p)) != 0)
+               postsig(sig);
+#endif
 
        curcpu()->ci_schedstate.spc_curpriority = p->p_priority = p->p_usrpri;
 }
diff -r 88c4d8221cea -r 8ad5f5378059 sys/arch/mips/mips/trap.c
--- a/sys/arch/mips/mips/trap.c Sun Jan 14 00:35:53 2001 +0000
+++ b/sys/arch/mips/mips/trap.c Sun Jan 14 00:39:48 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.156 2001/01/14 00:35:53 thorpej Exp $       */
+/*     $NetBSD: trap.c,v 1.157 2001/01/14 00:39:48 thorpej Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -44,7 +44,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.156 2001/01/14 00:35:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.157 2001/01/14 00:39:48 thorpej Exp $");
 
 #include "opt_cputype.h"       /* which mips CPU levels do we support? */
 #include "opt_ktrace.h"
@@ -686,7 +686,9 @@
        unsigned pc;            /* program counter where to continue */
 {
        struct proc *p = curproc;
+#if 0
        int sig;
+#endif
 
        while (astpending) {
                uvmexp.softs++;
@@ -697,9 +699,11 @@
                        ADDUPROF(p);
                }
 
+#if 0 /* XXX Need to make astpending per-process */
                /* Take pending signals. */
                while ((sig = CURSIG(p)) != 0)
                        postsig(sig);
+#endif
 
                if (want_resched) {
                        /*
@@ -707,9 +711,11 @@
                         */
                        preempt(NULL);
 
+#if 0 /* XXX Need to make astpending per-process */
                        /* Running again; take any new pending signals. */
                        while ((sig = CURSIG(p)) != 0)
                                postsig(sig);
+#endif
                }
 
                userret(p);