| Message ID | ea903917-e51b-4cc9-2680-bc1e36efa026@infradead.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [v2] x86/pci: fix intel_mid_pci.c build error when ACPI is not enabled | expand |
On Fri, Aug 21, 2020 at 05:10:27PM -0700, Randy Dunlap wrote: > From: Randy Dunlap <rdunlap@infradead.org> > > Fix build error when CONFIG_ACPI is not set/enabled by adding > the header file <asm/acpi.h> which contains a stub for the function > in the build error. > > ../arch/x86/pci/intel_mid_pci.c: In function ‘intel_mid_pci_init’: > ../arch/x86/pci/intel_mid_pci.c:303:2: error: implicit declaration of function ‘acpi_noirq_set’; did you mean ‘acpi_irq_get’? [-Werror=implicit-function-declaration] > acpi_noirq_set(); > > Fixes: a912a7584ec3 ("x86/platform/intel-mid: Move PCI initialization to arch_init()") > Signed-off-by: Randy Dunlap <rdunlap@infradead.org> > Cc: stable@vger.kernel.org # v4.16+ > Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> > Cc: Len Brown <lenb@kernel.org> > To: Bjorn Helgaas <bhelgaas@google.com> > Cc: Jesse Barnes <jsbarnes@google.com> > Cc: Arjan van de Ven <arjan@linux.intel.com> > Cc: linux-pci@vger.kernel.org > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> > Reviewed-by: Jesse Barnes <jsbarnes@google.com> > Acked-by: Thomas Gleixner <tglx@linutronix.de> Applied to pci/misc for v5.10, thanks! We could put it in v5.9, but a912a7584ec3 was merged for v4.16, so apparently this has been broken for a long time. > --- > Found in linux-next, but applies to/exists in mainline also. > > v2: > - add Reviewed-by: and Acked-by: tags > - drop alternatives > > arch/x86/pci/intel_mid_pci.c | 1 + > 1 file changed, 1 insertion(+) > > --- linux-next-20200813.orig/arch/x86/pci/intel_mid_pci.c > +++ linux-next-20200813/arch/x86/pci/intel_mid_pci.c > @@ -33,6 +33,7 @@ > #include <asm/hw_irq.h> > #include <asm/io_apic.h> > #include <asm/intel-mid.h> > +#include <asm/acpi.h> > > #define PCIE_CAP_OFFSET 0x100 > >
--- linux-next-20200813.orig/arch/x86/pci/intel_mid_pci.c +++ linux-next-20200813/arch/x86/pci/intel_mid_pci.c @@ -33,6 +33,7 @@ #include <asm/hw_irq.h> #include <asm/io_apic.h> #include <asm/intel-mid.h> +#include <asm/acpi.h> #define PCIE_CAP_OFFSET 0x100