Module Name: src
Committed By: matt
Date: Sat Feb 6 14:41:09 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: locore_mips3.S
Log Message:
wait idle also needs to see if at least one interrupt is unmasked.
To generate a diff of this commit:
cvs rdiff -u -r1.93.38.3 -r1.93.38.4 src/sys/arch/mips/mips/locore_mips3.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_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.93.38.3 src/sys/arch/mips/mips/locore_mips3.S:1.93.38.4
--- src/sys/arch/mips/mips/locore_mips3.S:1.93.38.3 Fri Aug 21 17:50:35 2009
+++ src/sys/arch/mips/mips/locore_mips3.S Sat Feb 6 14:41:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips3.S,v 1.93.38.3 2009/08/21 17:50:35 matt Exp $ */
+/* $NetBSD: locore_mips3.S,v 1.93.38.4 2010/02/06 14:41:09 matt Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -167,8 +167,11 @@
*/
LEAF(mips_wait_idle)
mfc0 v0, MIPS_COP_0_STATUS
- andi v0, v0, MIPS_SR_INT_IE
- bne v0, zero, 1f
+ andi v1, v0, MIPS_SR_INT_IE
+ bne v1, zero, 1f
+ nop
+ andi v1, v0, MIPS_INT_MASK
+ bne v1, zero, 1f
nop
PANIC("mips_wait_idle: interrupts disabled")
