diff options
| author | simokawa <simokawa@FreeBSD.org> | 2003-10-25 15:05:59 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2003-10-25 15:05:59 +0000 |
| commit | e7ca1c45525f573e36727f7c4626f584f01c2427 (patch) | |
| tree | 0659896039a7285c30c840a888e66d0fe4bb21f0 /sys/dev/firewire/fwohci_pci.c | |
| parent | ff63cdda69f9695ba5a58ea0660f454edf3103f7 (diff) | |
| download | FreeBSD-src-e7ca1c45525f573e36727f7c4626f584f01c2427.zip FreeBSD-src-e7ca1c45525f573e36727f7c4626f584f01c2427.tar.gz | |
Fix fwmem_strategy() race in 4-stable.
Diffstat (limited to 'sys/dev/firewire/fwohci_pci.c')
| -rw-r--r-- | sys/dev/firewire/fwohci_pci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index ac2a328..795aade 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -288,6 +288,9 @@ fwohci_pci_attach(device_t self) /* XXX splcam() should mask this irq for sbp.c*/ err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_CAM, (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_cam); + /* XXX splbio() should mask this irq for physio()/fwmem_strategy() */ + err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, + (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio); #endif if (err) { device_printf(self, "Could not setup irq, %d\n", err); @@ -372,7 +375,8 @@ fwohci_pci_detach(device_t self) device_printf(self, "Could not tear down irq, %d\n", err); #if __FreeBSD_version < 500000 - err = bus_teardown_intr(self, sc->irq_res, sc->ih_cam); + bus_teardown_intr(self, sc->irq_res, sc->ih_cam); + bus_teardown_intr(self, sc->irq_res, sc->ih_bio); #endif sc->ih = NULL; } |
