summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2007-01-09 08:43:26 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2007-01-09 08:43:26 +0000
commita2c17b45d6651fef83683a6b651547ff0ff19abe (patch)
treee7a723f191655f5674455cb4fcc6200eeb854d14 /sys/arch/i386
parent22da1cdae695e61c76eb6c086ebad9a347e9da67 (diff)
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
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/trap.c4
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[] = {