Module Name: src
Committed By: snj
Date: Sat Feb 6 20:49:37 UTC 2016
Modified Files:
src/sys/arch/hp300/hp300 [netbsd-7-0]: intr.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1093):
sys/arch/hp300/hp300/intr.c: revision 1.42
Fix fatal "intr_dispatch: stray level 6 interrupt" panic by the GENERIC
kernel on machines without arcofi(4) audio (i.e. all hp300 except HP425e).
I failed to pull all necessary changes for arcofi(4) from OpenBSD
and I should have tested 7.0_RC kernels on my HP382 too :-(
Should be pulled up to netbsd-7 and netbsd-7-0.
To generate a diff of this commit:
cvs rdiff -u -r1.40.34.1 -r1.40.34.1.2.1 src/sys/arch/hp300/hp300/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/hp300/hp300/intr.c
diff -u src/sys/arch/hp300/hp300/intr.c:1.40.34.1 src/sys/arch/hp300/hp300/intr.c:1.40.34.1.2.1
--- src/sys/arch/hp300/hp300/intr.c:1.40.34.1 Fri Aug 29 11:42:15 2014
+++ src/sys/arch/hp300/hp300/intr.c Sat Feb 6 20:49:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.40.34.1 2014/08/29 11:42:15 martin Exp $ */
+/* $NetBSD: intr.c,v 1.40.34.1.2.1 2016/02/06 20:49:37 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.40.34.1 2014/08/29 11:42:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.40.34.1.2.1 2016/02/06 20:49:37 snj Exp $");
#define _HP300_INTR_H_PRIVATE
@@ -199,9 +199,12 @@ intr_dispatch(int evec /* format | vecto
list = &hp300_intr_list[ipl];
if (LIST_FIRST(&list->hi_q) == NULL) {
- printf("intr_dispatch: ipl %d unexpected\n", ipl);
- if (++unexpected > 10)
- panic("intr_dispatch: too many unexpected interrupts");
+ if (ipl != 6) {
+ printf("intr_dispatch: ipl %d unexpected\n", ipl);
+ if (++unexpected > 10)
+ panic("intr_dispatch:"
+ " too many unexpected interrupts");
+ }
return;
}
