Module Name: src
Committed By: matt
Date: Thu Mar 11 08:20:18 UTC 2010
Modified Files:
src/sys/arch/evbmips/evbmips [matt-nb5-mips64]: interrupt.c
Log Message:
don't pass MIPS_INT_MASK_5 to evbmips_iointr
To generate a diff of this commit:
cvs rdiff -u -r1.11.18.3 -r1.11.18.4 src/sys/arch/evbmips/evbmips/interrupt.c
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/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.3 src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.4
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.11.18.3 Mon Feb 15 07:37:36 2010
+++ src/sys/arch/evbmips/evbmips/interrupt.c Thu Mar 11 08:20:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.11.18.3 2010/02/15 07:37:36 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.11.18.4 2010/03/11 08:20:18 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11.18.3 2010/02/15 07:37:36 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.11.18.4 2010/03/11 08:20:18 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -73,11 +73,10 @@
cf.sr = status;
cf.intr = (ci->ci_idepth > 1);
mips3_clockintr(&cf);
+ pending ^= MIPS_INT_MASK_5;
}
- if (pending & (MIPS_INT_MASK_0|MIPS_INT_MASK_1|MIPS_INT_MASK_2|
- MIPS_INT_MASK_3|MIPS_INT_MASK_4)) {
- KASSERT(ipl == IPL_VM);
+ if (pending != 0) {
/* Process I/O and error interrupts. */
evbmips_iointr(ipl, pc, pending);
}
