diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-09-14 08:57:06 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-09-14 08:57:06 +0000 |
| commit | c18d44b5622d0e4c6d84d1b1d7d8840a7b21fa63 (patch) | |
| tree | 96e2cce13fe74996a31642700a8fea2351fd91b1 /sys/arch | |
| parent | 927fcb3e9d5f06a7a1f0292c797e66053b7e55ee (diff) | |
Simplify userret.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/mac68k/mac68k/trap.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index eabc4195432..c3e2f016602 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.27 2001/08/25 15:43:28 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.28 2001/09/14 08:57:05 art Exp $ */ /* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */ /* @@ -167,7 +167,7 @@ userret(p, fp, oticks, faultaddr, fromtrap) u_int faultaddr; int fromtrap; { - int sig, s; + int sig; #if defined(M68040) int beenhere = 0; union sigval sv; @@ -182,18 +182,9 @@ again: 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 setrunqueue ourselves but before - * we 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); } |