[src/netbsd-7-0]: src/sys/arch/hp300/hp300 Pull up following revision(s) (req...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e9fb5496f33c
branches:  netbsd-7-0
changeset: 801127:e9fb5496f33c
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Feb 06 20:49:37 2016 +0000

description:
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.

diffstat:

 sys/arch/hp300/hp300/intr.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r f9a46533ea65 -r e9fb5496f33c sys/arch/hp300/hp300/intr.c
--- a/sys/arch/hp300/hp300/intr.c       Sat Feb 06 20:26:55 2016 +0000
+++ b/sys/arch/hp300/hp300/intr.c       Sat Feb 06 20:49:37 2016 +0000
@@ -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 @@
 
        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;
        }