diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 17:13:09 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 17:13:09 +0100 |
| commit | a07ae842e209196ffe0fe8feacd489aba772d8a0 (patch) | |
| tree | 1422a2ec714d711a58c4593f1647cebeebc999c6 /arch/x86/pci | |
| parent | Merge branch 'pci/trivial' into next (diff) | |
| parent | PCI: Expose ari_enabled in sysfs (diff) | |
| download | linux-a07ae842e209196ffe0fe8feacd489aba772d8a0.tar.xz linux-a07ae842e209196ffe0fe8feacd489aba772d8a0.zip | |
Merge branch 'pci/virtualization' into next
* pci/virtualization:
PCI: Expose ari_enabled in sysfs
PCI: Add function 1 DMA alias quirk for Marvell 9128
PCI: Mark Ceton InfiniTV4 INTx masking as broken
xen/pci: Use acpi_noirq_set() helper to avoid #ifdef
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/xen.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index c4b3646bd04c..9542a746dc50 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -409,10 +409,8 @@ int __init pci_xen_init(void) pcibios_enable_irq = xen_pcifront_enable_irq; pcibios_disable_irq = NULL; -#ifdef CONFIG_ACPI /* Keep ACPI out of the picture */ - acpi_noirq = 1; -#endif + acpi_noirq_set(); #ifdef CONFIG_PCI_MSI x86_msi.setup_msi_irqs = xen_setup_msi_irqs; |