From: Alexander Polakov <polachok@gmail.com>
Date: Tue, 3 Nov 2009 21:16:57 +0000 (+0300)
Subject: Always do PCI_REROUTE_INTERRUPT.
X-Git-Url: https://gitweb.dragonflybsd.org/~polachok/dragonfly.git/commitdiff_plain/0c6fbaa685b5d2f0a9a33f71c31dd41919a7aef2

Always do PCI_REROUTE_INTERRUPT.
---

diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c
index 9864035682..4029a5f96d 100644
--- a/sys/bus/pci/pci.c
+++ b/sys/bus/pci/pci.c
@@ -2877,7 +2877,6 @@ pci_add_resources(device_t pcib, device_t bus, device_t dev, int force, uint32_t
 	}
 
 	if (cfg->intpin > 0 && PCI_INTERRUPT_VALID(cfg->intline)) {
-#if defined(__PCI_REROUTE_INTERRUPT) || defined(APIC_IO) || defined(ACPI_ENABLE_PCI)
 		/*
 		 * Try to re-route interrupts. Sometimes the BIOS or
 		 * firmware may leave bogus values in these registers.
@@ -2885,9 +2884,6 @@ pci_add_resources(device_t pcib, device_t bus, device_t dev, int force, uint32_t
 		 * have.
 		 */
 		pci_assign_interrupt(bus, dev, 1);
-#else
-		pci_assign_interrupt(bus, dev, 0);
-#endif
 	}
 }