Module Name: src
Committed By: matt
Date: Sun May 16 05:00:12 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: locore.S
Log Message:
If IPL_SCHED != IPL_HIGH we need to raise ourselves back to IPL_HIGH before
we return from a fast softint that was switchedaway from.
To generate a diff of this commit:
cvs rdiff -u -r1.167.38.17 -r1.167.38.18 src/sys/arch/mips/mips/locore.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.167.38.17 src/sys/arch/mips/mips/locore.S:1.167.38.18
--- src/sys/arch/mips/mips/locore.S:1.167.38.17 Sun Feb 28 03:28:54 2010
+++ src/sys/arch/mips/mips/locore.S Sun May 16 05:00:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.167.38.17 2010/02/28 03:28:54 matt Exp $ */
+/* $NetBSD: locore.S,v 1.167.38.18 2010/05/16 05:00:12 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -319,8 +319,13 @@
REG_L ra, CALLFRAME_RA(sp)
REG_L v0, CALLFRAME_S0(sp) # get softint lwp
PTR_S zero, L_CTXSWITCH(v0) # clear l_ctxswtch
+#if IPL_SCHED != IPL_HIGH
+ j _C_LABEL(splhigh_noprof)
+#else
j ra
+#endif
PTR_ADDU sp, CALLFRAME_SIZ
+
/*
* Arguments:
* a0 the LWP to switch to
