Module Name: src
Committed By: dholland
Date: Tue May 31 02:26:00 UTC 2016
Modified Files:
src/sys/arch/arm/omap: omap2430_intr.c
Log Message:
PR 50755 David Binderman: assert about table entries only when they exist.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/omap2430_intr.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/arm/omap/omap2430_intr.c
diff -u src/sys/arch/arm/omap/omap2430_intr.c:1.6 src/sys/arch/arm/omap/omap2430_intr.c:1.7
--- src/sys/arch/arm/omap/omap2430_intr.c:1.6 Fri Jul 1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap2430_intr.c Tue May 31 02:26:00 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2430_intr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: omap2430_intr.c,v 1.7 2016/05/31 02:26:00 dholland Exp $ */
/*
* Define the SDP2430 specific information and then include the generic OMAP
* interrupt header.
@@ -35,7 +35,7 @@
#include "opt_omap.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2430_intr.c,v 1.6 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2430_intr.c,v 1.7 2016/05/31 02:26:00 dholland Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -455,7 +455,9 @@ deliver_irqs(register_t psw, int ipl, vo
KASSERT((intrgroups[4].ig_pending_irqs & intrgroups[4].ig_irqsbyipl[ipl]) == 0);
KASSERT((intrgroups[5].ig_pending_irqs & intrgroups[5].ig_irqsbyipl[ipl]) == 0);
KASSERT((intrgroups[6].ig_pending_irqs & intrgroups[6].ig_irqsbyipl[ipl]) == 0);
+#ifdef OMAP_2430
KASSERT((intrgroups[7].ig_pending_irqs & intrgroups[7].ig_irqsbyipl[ipl]) == 0);
+#endif
if (frame == NULL)
last_delivered_ipl = saved_ipl;
}
