| Message ID | 20171110180819.83868-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Fri, Nov 10, 2017 at 08:08:19PM +0200, Andy Shevchenko wrote: > No need to keep an #ifdef since we have a helper (in x86 world). > Use it instead. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > - resend as v2 with slightly longer Cc list, i.e. +Rafael and ACPI ML > - in v1 Bjorn told he is okay with patch, but assumed it goes not via PCI tree Sorry, I didn't understand your pings on the previous patch correctly, and I still assumed a Xen or x86 person would take this. Since they haven't, I put it on pci/virtualization for v4.16. If anybody else wants it and does pick it up, let me know and I'll drop it. Bjorn > arch/x86/pci/xen.c | 4 +--- > 1 file changed, 1 insertion(+), 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; > -- > 2.14.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
No need to keep an #ifdef since we have a helper (in x86 world). Use it instead. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- - resend as v2 with slightly longer Cc list, i.e. +Rafael and ACPI ML - in v1 Bjorn told he is okay with patch, but assumed it goes not via PCI tree arch/x86/pci/xen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)