From d43d34a8bd7030a93475f827ba37de574120a9bc Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 5 Dec 2005 19:50:00 +0000 Subject: If pci_link has been disabled via the acpi_disable tunable, then bail immediately from acpi_pci_link_route_interrupt() since we aren't going to have a valid pci_link device to talk to try to route interrupts. This fixes a page fault if you disable just pci_link. Note that trying to use ACPI without pci_link is probably not advised however. MFC after: 1 week Tested by: Eugene Grosbein eugen at kuzbass dot ru --- sys/dev/acpica/acpi_pci_link.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sys/dev/acpica') diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 5b73edb..4b7415b 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -1011,6 +1011,9 @@ acpi_pci_link_route_interrupt(device_t dev, int index) { struct link *link; + if (acpi_disabled("pci_link")) + return (PCI_INVALID_IRQ); + ACPI_SERIAL_BEGIN(pci_link); link = acpi_pci_link_lookup(dev, index); if (link == NULL) -- cgit v1.1