diff options
author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-05-06 18:44:40 +0000 |
---|---|---|
committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-05-06 18:44:40 +0000 |
commit | 596f1ac4d205bdc68fd2c3fb4758d034a13b7df2 (patch) | |
tree | c5f45989f267f6b94f345e4e963b9840cc02a2fa /sys/arch/i386 | |
parent | 5ab30695787e9edbc600757fa4b2bd0a72b304b3 (diff) |
drop out of any intr fixup activities if was disabled in the config flags
Diffstat (limited to 'sys/arch/i386')
-rw-r--r-- | sys/arch/i386/pci/pci_intr_fixup.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c index a5e2d5c9791..da519ee0cf8 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.22 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: pci_intr_fixup.c,v 1.23 2002/05/06 18:44:39 mickey Exp $ */ /* $NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $ */ /* @@ -498,6 +498,9 @@ pci_intr_route_link(pc, ihp) int rv = 1; char *p = NULL; + if (pcibios_flags & PCIBIOS_INTR_FIXUP) + return 1; + l = ihp->link; if (!l || pciintr_icu_tag == NULL) return (1); @@ -556,6 +559,9 @@ pci_intr_post_fixup() struct pciintr_link_map *l; int i, pciirq; + if (pcibios_flags & PCIBIOS_INTR_FIXUP) + return 1; + if (!pciintr_icu_handle) return 0; @@ -598,6 +604,9 @@ pci_intr_header_fixup(pc, tag, ihp) int irq, link, bus, device, function; char *p = NULL; + if (pcibios_flags & PCIBIOS_INTR_FIXUP) + return 1; + irq = ihp->line; ihp->link = NULL; ihp->tag = tag; |