Re: [PATCH] x86/pci: don't set acpi stuff if !CONFIG_ACPI

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 8/20/20 5:53 AM, Adam Borowski wrote:
> Not that x86 without ACPI sees any real use...
> 
> Signed-off-by: Adam Borowski <kilobyte@xxxxxxxxxx>
> ---
> Found by randconfig builds.

Note that
#include <asm/acpi.h>
has a stub for acpi_noirq_set() when ACPI is not set/enabled.
That would be better.  And I have submitted that for
arch/x86/pci/xen.c -- and a different patch for intel_mid_pci.c

But I didn't submit them to the X86 maintainers because the
MAINTAINERS file pointed me to the PCI maintainer and to the
XEN PCI maintainer....


> 
>  arch/x86/pci/intel_mid_pci.c | 2 ++
>  arch/x86/pci/xen.c           | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
> index 00c62115f39c..f14a911f0d06 100644
> --- a/arch/x86/pci/intel_mid_pci.c
> +++ b/arch/x86/pci/intel_mid_pci.c
> @@ -299,8 +299,10 @@ int __init intel_mid_pci_init(void)
>  	pcibios_disable_irq = intel_mid_pci_irq_disable;
>  	pci_root_ops = intel_mid_pci_ops;
>  	pci_soc_mode = 1;
> +#ifdef CONFIG_ACPI
>  	/* Continue with standard init */
>  	acpi_noirq_set();
> +#endif
>  	return 1;
>  }
>  
> diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
> index 9f9aad42ccff..681eb5c34c03 100644
> --- a/arch/x86/pci/xen.c
> +++ b/arch/x86/pci/xen.c
> @@ -406,8 +406,10 @@ 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_set();
> +#endif
>  
>  #ifdef CONFIG_PCI_MSI
>  	x86_msi.setup_msi_irqs = xen_setup_msi_irqs;
> 


-- 
~Randy
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>



[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux