summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-01-18 17:04:12 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-01-18 17:04:12 +0000
commitd7727e97bfb0f0803ffe1bebc40c62d19073f955 (patch)
tree0e13f3af738143ec7e9a0fb339d5e06b0be1f8db /sys
parentc8cdabdd45a2b9e75b6b596f9c59e4def34dedeb (diff)
Do not call splx() from cpu_switchto(), we are at IPL_SCHED anyway and ipl will
be lowered later, by the caller. This was supposed to be harmless, but newly created processes inherit a bogus level from proc0, which in turn causes a race on MULTIPROCESSOR kernel.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mips64/mips64/context.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/mips64/mips64/context.S b/sys/arch/mips64/mips64/context.S
index 97c18cdb4d1..7f92f1381c6 100644
--- a/sys/arch/mips64/mips64/context.S
+++ b/sys/arch/mips64/mips64/context.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: context.S,v 1.39 2010/01/10 13:00:24 miod Exp $ */
+/* $OpenBSD: context.S,v 1.40 2010/01/18 17:04:11 miod Exp $ */
/*
* Copyright (c) 2002-2003 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -287,8 +287,6 @@ ctx3:
REG_L s7, PCB_CONTEXT+7*REGSZ(t3)
REG_L sp, PCB_CONTEXT+8*REGSZ(t3)
REG_L s8, PCB_CONTEXT+9*REGSZ(t3)
- jal splx
- REG_L a0, PCB_CONTEXT+13*REGSZ(t3)
REG_L ra, PCB_CONTEXT+10*REGSZ(t3)
REG_L v0, PCB_CONTEXT+11*REGSZ(t3)
#ifdef RM7000_ICR