Module Name: src
Committed By: macallan
Date: Fri Dec 26 18:08:52 UTC 2014
Modified Files:
src/sys/arch/evbmips/evbmips: interrupt.c
Log Message:
put #ifdef MIPS3_ENABLE_CLOCK_INTR around special handling of INT5
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 src/sys/arch/evbmips/evbmips/interrupt.c:1.21
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.20 Sat Nov 22 15:17:02 2014
+++ src/sys/arch/evbmips/evbmips/interrupt.c Fri Dec 26 18:08:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.20 2014/11/22 15:17:02 macallan Exp $ */
+/* $NetBSD: interrupt.c,v 1.21 2014/12/26 18:08:52 macallan Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.20 2014/11/22 15:17:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.21 2014/12/26 18:08:52 macallan Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -75,16 +75,16 @@ cpu_intr(int ppl, vaddr_t pc, uint32_t s
cf.sr = status;
cf.intr = (ci->ci_idepth > 1);
+#ifdef MIPS3_ENABLE_CLOCK_INTR
if (pending & MIPS_INT_MASK_5) {
KASSERTMSG(ipl == IPL_SCHED,
"%s: ipl (%d) != IPL_SCHED (%d)",
__func__, ipl, IPL_SCHED);
-#ifdef MIPS3_ENABLE_CLOCK_INTR
/* call the common MIPS3 clock interrupt handler */
mips3_clockintr(&cf);
-#endif
pending ^= MIPS_INT_MASK_5;
}
+#endif
if (pending != 0) {
/* Process I/O and error interrupts. */
