diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-09-14 06:04:59 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-09-14 06:04:59 +0000 |
| commit | 927fcb3e9d5f06a7a1f0292c797e66053b7e55ee (patch) | |
| tree | 44453c9612eff716e1f51107317d26881b56d389 /sys | |
| parent | 738b383f9a6ba63ed5c1716a5ad3344b980affe7 (diff) | |
Simplify userret.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hp300/hp300/trap.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c index 2f3700697ba..eec8a4fefca 100644 --- a/sys/arch/hp300/hp300/trap.c +++ b/sys/arch/hp300/hp300/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.27 2001/08/25 16:15:15 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.28 2001/09/14 06:04:58 art Exp $ */ /* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */ /* @@ -217,7 +217,7 @@ userret(p, fp, oticks, faultaddr, fromtrap) u_int faultaddr; int fromtrap; { - int sig, s; + int sig; #ifdef M68040 union sigval sv; int beenhere = 0; @@ -230,18 +230,9 @@ again: p->p_priority = p->p_usrpri; if (want_resched) { /* - * Since we are curproc, clock will normally just change - * our priority without moving us from one queue to another - * (since the running process is not on a queue.) - * If that happened after we put ourselves on the run queue - * but before we mi_switch()'ed, we might not be on the queue - * indicated by our priority. + * We're being preempted. */ - s = splstatclock(); - setrunqueue(p); - p->p_stats->p_ru.ru_nivcsw++; - mi_switch(); - splx(s); + preempt(NULL); while ((sig = CURSIG(p)) != 0) postsig(sig); } |