summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-12-11 19:47:38 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-12-11 19:47:38 +0000
commit784057872389af433017dcdacadd1e9a82c701d6 (patch)
treeddf09be0489246a3e0274d6d1b17381fd7029c8b /sys/dev
parentcf8c382c7360f5cca81208b17363bcea5f55a4b7 (diff)
On i386, swizzle interrupts for devices for which we don't have explicit
inetrrupt routing information. ok deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/pci.c3
-rw-r--r--sys/dev/pci/pcivar.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 8483da534db..143952ea170 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci.c,v 1.47 2006/10/04 19:27:44 kettenis Exp $ */
+/* $OpenBSD: pci.c,v 1.48 2006/12/11 19:47:37 kettenis Exp $ */
/* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */
/*
@@ -271,6 +271,7 @@ pci_probe_device(struct pci_softc *sc, pcitag_t tag,
pa.pa_tag = tag;
pa.pa_id = id;
pa.pa_class = class;
+ pa.pa_bridgetag = sc->sc_bridgetag;
/* This is a simplification of the NetBSD code.
We don't support turning off I/O or memory
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index f2e3f4fc25b..27396b2c348 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcivar.h,v 1.48 2006/04/07 01:04:49 brad Exp $ */
+/* $OpenBSD: pcivar.h,v 1.49 2006/12/11 19:47:37 kettenis Exp $ */
/* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */
/*
@@ -112,6 +112,8 @@ struct pci_attach_args {
pcitag_t pa_tag;
pcireg_t pa_id, pa_class;
+ pcitag_t *pa_bridgetag;
+
/*
* Interrupt information.
*