| Message ID | 20170717103907.77308-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, Jul 17, 2017 at 01:39:07PM +0300, 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> Looks reasonable to me, and I assume some non-PCI tree will take it. > --- > 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.11.0 >
On Wed, 2017-08-02 at 16:45 -0500, Bjorn Helgaas wrote: > On Mon, Jul 17, 2017 at 01:39:07PM +0300, 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> > > Looks reasonable to me, and I assume some non-PCI tree will take it. It seems either TODO list is long, or everyone from x86 is on vacation :-) Can't you push this through your tree? > > > --- > > 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.11.0 > >
On Thu, 2017-08-10 at 12:19 +0300, Andy Shevchenko wrote: > On Wed, 2017-08-02 at 16:45 -0500, Bjorn Helgaas wrote: > > On Mon, Jul 17, 2017 at 01:39:07PM +0300, 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> > > > > Looks reasonable to me, and I assume some non-PCI tree will take it. > > It seems either TODO list is long, or everyone from x86 is on vacation > :-) > > Can't you push this through your tree? It might be lost in pile of mails, a gentle up.
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> --- arch/x86/pci/xen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)