1 files changed, 10 insertions, 6 deletions

diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 78ca1ecbb907..766b104ac1a1 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1051,24 +1051,28 @@ static int __init pcibios_irq_init(void)
 subsys_initcall(pcibios_irq_init);
 
 
-static void pirq_penalize_isa_irq(int irq)
+static void pirq_penalize_isa_irq(int irq, int active)
 {
         /*
          *  If any ISAPnP device reports an IRQ in its list of possible
          *  IRQ's, we try to avoid assigning it to PCI devices.
          */
-        if (irq < 16)
-                pirq_penalty[irq] += 100;
+        if (irq < 16) {
+                if (active)
+                        pirq_penalty[irq] += 1000;
+                else
+                        pirq_penalty[irq] += 100;
+        }
 }
 
-void pcibios_penalize_isa_irq(int irq)
+void pcibios_penalize_isa_irq(int irq, int active)
 {
 #ifdef CONFIG_ACPI_PCI
         if (!acpi_noirq)
-                acpi_penalize_isa_irq(irq);
+                acpi_penalize_isa_irq(irq, active);
         else
 #endif
-                pirq_penalize_isa_irq(irq);
+                pirq_penalize_isa_irq(irq, active);
 }
 
 static int pirq_enable_irq(struct pci_dev *dev)