Re: [PATCH v2] x86/pci: fix intel_mid_pci.c build error when ACPI is not enabled

From: Bjorn Helgaas
Date: Thu Aug 27 2020 - 15:05:23 EST


On Fri, Aug 21, 2020 at 05:10:27PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx # v4.16+
> Cc: Jacob Pan <jacob.jun.pan@xxxxxxxxxxxxxxx>
> Cc: Len Brown <lenb@xxxxxxxxxx>
> To: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Jesse Barnes <jsbarnes@xxxxxxxxxx>
> Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
> Cc: linux-pci@xxxxxxxxxxxxxxx
> Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> Reviewed-by: Jesse Barnes <jsbarnes@xxxxxxxxxx>
> Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

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
>
>