summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1993-11-05 23:18:51 +0000
committercgd <cgd@NetBSD.org>1993-11-05 23:18:51 +0000
commit34178aa2efe0c0dcdc23988976fa8ed732674de3 (patch)
treeb5d8b9578c8314462327c90bd789886c35b3d24f /sys
parentab12bacae0bc41ed82e8d047f9030f8e3228d5d9 (diff)
don't use splclock()/splnone(), use splclock()/splx().
pointed out by david greenman.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/i386/trap.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index 569e178ce99..6a7e377de28 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)trap.c 7.4 (Berkeley) 5/13/91
- * $Id: trap.c,v 1.17 1993/09/21 13:43:15 brezak Exp $
+ * $Id: trap.c,v 1.18 1993/11/05 23:18:51 cgd Exp $
*/
/*
@@ -89,6 +89,7 @@ trap(frame)
register struct proc *p = curproc;
struct timeval syst;
int ucode, type, code, eva;
+ int s;
frame.tf_eflags &= ~PSL_NT; /* clear nested trap XXX */
type = frame.tf_trapno;
@@ -368,11 +369,11 @@ out:
* swtch()'ed, we might not be on the queue indicated by
* our priority.
*/
- (void) splclock();
+ s = splclock();
setrq(p);
p->p_stats->p_ru.ru_nivcsw++;
swtch();
- (void) splnone();
+ splx(s);
while (i = CURSIG(p))
psig(i);
}
@@ -425,7 +426,7 @@ syscall(frame)
register struct sysent *callp;
register struct proc *p = curproc;
struct timeval syst;
- int error, opc;
+ int error, opc, s;
int args[8], rval[2];
int code;
@@ -503,11 +504,11 @@ done:
* swtch()'ed, we might not be on the queue indicated by
* our priority.
*/
- (void) splclock();
+ s = splclock();
setrq(p);
p->p_stats->p_ru.ru_nivcsw++;
swtch();
- (void) splnone();
+ splx(s);
while (i = CURSIG(p))
psig(i);
}