Hi!

> [ Upstream commit 70bad345e622c23bb530016925c936ab04a646ac ]
> 
> When the kernel is comiled with CONFIG_IRQ_REMAP=y but without
> CONFIG_IOMMU_INTEL compilation fails since commit def054b01a8678 with an
> undefined reference to device_rbtree_find(). This patch makes sure that
> intel specific code is only compiled with CONFIG_IOMMU_INTEL=y.

We don't have commit def054b01a8678 in -stable, so we should not need
this.

Best regards,
								Pavel

> +++ b/drivers/iommu/Kconfig
> @@ -192,7 +192,7 @@ source "drivers/iommu/intel/Kconfig"
>  config IRQ_REMAP
>  	bool "Support for Interrupt Remapping"
>  	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI
> -	select DMAR_TABLE
> +	select DMAR_TABLE if INTEL_IOMMU
>  	help
>  	  Supports Interrupt remapping for IO-APIC and MSI devices.
>  	  To use x2apic mode in the CPU's which support x2APIC enhancements or
> diff --git a/drivers/iommu/intel/Makefile b/drivers/iommu/intel/Makefile
> index 7af3b8a4f2a00..29d26a4371327 100644
> --- a/drivers/iommu/intel/Makefile
> +++ b/drivers/iommu/intel/Makefile
> @@ -5,5 +5,7 @@ obj-$(CONFIG_DMAR_TABLE) += trace.o cap_audit.o
>  obj-$(CONFIG_DMAR_PERF) += perf.o
>  obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
>  obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
> +ifdef CONFIG_INTEL_IOMMU
>  obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
> +endif
>  obj-$(CONFIG_INTEL_IOMMU_PERF_EVENTS) += perfmon.o
> diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
> index 83314b9d8f38b..ee59647c20501 100644
> --- a/drivers/iommu/irq_remapping.c
> +++ b/drivers/iommu/irq_remapping.c
> @@ -99,7 +99,8 @@ int __init irq_remapping_prepare(void)
>  	if (disable_irq_remap)
>  		return -ENOSYS;
>  
> -	if (intel_irq_remap_ops.prepare() == 0)
> +	if (IS_ENABLED(CONFIG_INTEL_IOMMU) &&
> +	    intel_irq_remap_ops.prepare() == 0)
>  		remap_ops = &intel_irq_remap_ops;
>  	else if (IS_ENABLED(CONFIG_AMD_IOMMU) &&
>  		 amd_iommu_irq_ops.prepare() == 0)

-- 
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany