[src/netbsd-6]: src/sys/arch/i386/eisa Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/44eadc30f42a
branches:  netbsd-6
changeset: 776373:44eadc30f42a
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Jun 23 11:22:01 2013 +0000

description:
Pull up following revision(s) (requested by uebayasi in ticket #904):
        sys/arch/i386/eisa/eisa_machdep.c: revision 1.38
port-i386/47907: kernel trap when using EISA with I/O APIC on i386
Patch from Felix Deichmann.
XXX pullup netbsd-6

diffstat:

 sys/arch/i386/eisa/eisa_machdep.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r a5796b7c04c9 -r 44eadc30f42a sys/arch/i386/eisa/eisa_machdep.c
--- a/sys/arch/i386/eisa/eisa_machdep.c Sun Jun 23 11:17:29 2013 +0000
+++ b/sys/arch/i386/eisa/eisa_machdep.c Sun Jun 23 11:22:01 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eisa_machdep.c,v 1.37 2011/09/01 15:10:31 christos Exp $       */
+/*     $NetBSD: eisa_machdep.c,v 1.37.8.1 2013/06/23 11:22:01 bouyer Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.37 2011/09/01 15:10:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa_machdep.c,v 1.37.8.1 2013/06/23 11:22:01 bouyer Exp $");
 
 #include "ioapic.h"
 
@@ -106,7 +106,7 @@
 eisa_attach_hook(device_t parent, device_t self,
     struct eisabus_attach_args *eba)
 {
-       extern int eisa_has_been_seen; 
+       extern int eisa_has_been_seen;
 
        /*
         * Notify others that might need to know that the EISA bus
@@ -176,7 +176,6 @@
        snprintf(irqstr, sizeof(irqstr), "irq %d", ih);
 #endif
        return (irqstr);
-       
 }
 
 const struct evcnt *
@@ -199,12 +198,13 @@
 
 #if NIOAPIC > 0
        if (ih & APIC_INT_VIA_APIC) {
-               pic = (struct pic *)ioapic_find(APIC_IRQ_APIC(ih));
-               if (pic == NULL) {
-                       aprint_error("eisa_intr_establish: bad ioapic %d\n",
+               struct ioapic_softc * const ioapic = ioapic_find(APIC_IRQ_APIC(ih));
+               if (ioapic == NULL) {
+                       aprint_normal("eisa_intr_establish: bad ioapic %d\n",
                            APIC_IRQ_APIC(ih));
                        return NULL;
                }
+               pic = &ioapic->sc_pic;
                pin = APIC_IRQ_PIN(ih);
                irq = APIC_IRQ_LEGACY_IRQ(ih);
                if (irq < 0 || irq >= NUM_LEGACY_IRQS)