Module Name: src
Committed By: cliff
Date: Sun Mar 21 18:50:45 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: spl.S
Log Message:
- in _splsw_splintr, add 'nop' in delay slot to avoid incorrect return
of IPL_VM when nothing is pending
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/arch/mips/mips/spl.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/spl.S
diff -u src/sys/arch/mips/mips/spl.S:1.1.2.3 src/sys/arch/mips/mips/spl.S:1.1.2.4
--- src/sys/arch/mips/mips/spl.S:1.1.2.3 Tue Feb 23 20:32:33 2010
+++ src/sys/arch/mips/mips/spl.S Sun Mar 21 18:50:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.1.2.3 2010/02/23 20:32:33 matt Exp $ */
+/* $NetBSD: spl.S,v 1.1.2.4 2010/03/21 18:50:45 cliff Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <mips/asm.h>
#include <mips/cpuregs.h>
-RCSID("$NetBSD: spl.S,v 1.1.2.3 2010/02/23 20:32:33 matt Exp $")
+RCSID("$NetBSD: spl.S,v 1.1.2.4 2010/03/21 18:50:45 cliff Exp $")
#include "assym.h"
@@ -285,6 +285,7 @@
and v1, ta1, MIPS_HARD_INT_MASK # now have pending interrupts
li v0, IPL_NONE # return IPL_NONE
beq v1, zero, 2f # quick exit if nothing pending
+ nop
li v0, IPL_VM # start at IPL_VM
PTR_LA ta3, _C_LABEL(ipl_sr_map) + 4*IPL_VM
