diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-02-13 13:53:17 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2004-02-13 13:53:17 +0000 |
| commit | 1b86d1c74638bf1791a9e9f9c02f9d409e548de8 (patch) | |
| tree | d3c74a49a76aa194ce27ade4fe38aa62b0e0bbf8 /sys/arch/i386 | |
| parent | 1220d9e6c6f06aabb76f9d152da6e3b361865f8f (diff) | |
avoid routing irqs that we ignore (14 15); from form@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/pci/pci_intr_fixup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c index 90ea8ff2cd5..39e916dbff8 100644 --- a/sys/arch/i386/pci/pci_intr_fixup.c +++ b/sys/arch/i386/pci/pci_intr_fixup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_intr_fixup.c,v 1.30 2004/01/02 13:57:45 mickey Exp $ */ +/* $OpenBSD: pci_intr_fixup.c,v 1.31 2004/02/13 13:53:16 mickey Exp $ */ /* $NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $ */ /* @@ -642,7 +642,6 @@ pci_intr_header_fixup(pc, tag, ihp) return 1; } - ihp->link = l; if (irq == 14 || irq == 15) p = " WARNING: ignored"; else if (l->irq == I386_PCI_INTERRUPT_LINE_NO_CONNECTION) { @@ -662,6 +661,7 @@ pci_intr_header_fixup(pc, tag, ihp) p = " fixed up"; ihp->line = l->irq; + ihp->link = l; } else { /* routed by BIOS, but inconsistent */ @@ -669,6 +669,7 @@ pci_intr_header_fixup(pc, tag, ihp) /* believe PCI IRQ Routing table */ p = " WARNING: overriding"; ihp->line = l->irq; + ihp->link = l; #else /* believe PCI Interrupt Configuration Register (default) */ p = " WARNING: preserving"; |