diff options
| author |   art <art@openbsd.org> | 2007-01-09 08:43:25 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 2007-01-09 08:43:25 +0000 |
| commit | 9565b858ebd803dc5a382591d24b5ba8992ba6b2 (patch) | |
| tree | 7421246568272487468e9e2660f5aca3aac3c10d | |
| parent | Accept empty command, from Matthew R. Dempsky; ok deraadt@ millert@ (diff) | |
| download | wireguard-openbsd-9565b858ebd803dc5a382591d24b5ba8992ba6b2.tar.xz wireguard-openbsd-9565b858ebd803dc5a382591d24b5ba8992ba6b2.zip | |
Miod used a too large hatchet when trimming userret in 1.80.
Restore user priority before returning to userland.
(other architectures checked and seem to do the right thing)
miod@ ok
| -rw-r--r-- | sys/arch/i386/i386/trap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c index f4f84c0a2f4..37c2fd28b26 100644 --- a/sys/arch/i386/i386/trap.c +++ b/sys/arch/i386/i386/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.80 2006/12/24 20:30:35 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.81 2007/01/09 08:43:25 art Exp $ */ /* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */ /*- @@ -115,7 +115,7 @@ userret(struct proc *p) while ((sig = CURSIG(p)) != 0) postsig(sig); - p->p_cpu->ci_schedstate.spc_curpriority = p->p_priority; + p->p_cpu->ci_schedstate.spc_curpriority = p->p_priority = p->p_usrpri; } char *trap_type[] = { |