summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2016-06-29 04:27:36 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-07-02 01:38:34 +0200
commit487cf917ed0d12afaf403d9d77684bf44b8c13be (patch)
tree32d3e2557cddb92a7b45e44f38c3350cba542d6c /arch
parent4a6e68bf96c1fa293717d2f00a68a68c92fa4150 (diff)
downloadlinux-487cf917ed0d12afaf403d9d77684bf44b8c13be.tar.gz
linux-487cf917ed0d12afaf403d9d77684bf44b8c13be.tar.xz
Revert "ACPI, PCI, IRQ: remove redundant code in acpi_irq_penalty_init()"
Trying to make the ISA and PCI init functionality common turned out to be a bad idea, because the ISA path depends on external functionality. Restore the previous behavior and limit the refactoring to PCI interrupts only. Fixes: 1fcb6a813c4f "ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init()" Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Tested-by: Wim Osterholt <wim@djo.tudelft.nl> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/acpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index b2a4e2a..3cd6983 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -396,6 +396,7 @@ int __init pci_acpi_init(void)
return -ENODEV;
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+ acpi_irq_penalty_init();
pcibios_enable_irq = acpi_pci_irq_enable;
pcibios_disable_irq = acpi_pci_irq_disable;
x86_init.pci.init_irq = x86_init_noop;