summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/pci
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2006-11-25 16:59:32 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2006-11-25 16:59:32 +0000
commitdf051cfcc1226d26b85f9ac9aa7c874e9c88ae81 (patch)
tree00a0ded035702cdd4370ab83ee54f5b0baec8cad /sys/arch/amd64/pci
parentd845014b7d5a3b3cdb5441166055f3dea7ea5f56 (diff)
sync amd64 to i386 w.r.t. acpi support. Also fix interrupt routing for multi-ioapic systems.
ok kettenis
Diffstat (limited to 'sys/arch/amd64/pci')
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 020f122774f..2b056fadd0b 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.8 2006/05/31 06:13:48 weingart Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.9 2006/11/25 16:59:31 niklas Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -481,12 +481,12 @@ pci_intr_map(pa, ihp)
}
#if NIOAPIC > 0
if (mp_busses != NULL) {
- if (intr_find_mpmapping(mp_isa_bus, line, ihp) == 0) {
+ if (intr_find_mpmapping(mp_isa_bus->mb_idx, line, ihp) == 0) {
*ihp |= line;
return 0;
}
#if NEISA > 0
- if (intr_find_mpmapping(mp_eisa_bus, line, ihp) == 0) {
+ if (intr_find_mpmapping(mp_eisa_bus->mb_idx, line, ihp) == 0) {
*ihp |= line;
return 0;
}