Commit ddcc66cf authored May 12, 2025 by Rolf Eike Beer Committed by Joerg Roedel May 16, 2025

iommu: make inclusion of intel directory conditional



Nothing in there is active if CONFIG_INTEL_IOMMU is not enabled, so the whole
directory can depend on that switch as well.

Fixes: ab65ba57 ("iommu/vt-d: Move Kconfig and Makefile bits down into intel directory")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/3818749.MHq7AAxBmi@devpool92.emlix.com


Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 9548feff

drivers/iommu/Makefile

+2 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		obj-y += amd/ intel/ arm/ iommufd/ riscv/
		obj-y += amd/ arm/ iommufd/ riscv/
		obj-$(CONFIG_INTEL_IOMMU) += intel/
		obj-$(CONFIG_IOMMU_API) += iommu.o
		obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o
		obj-$(CONFIG_IOMMU_API) += iommu-traces.o

drivers/iommu/intel/Makefile

+2 −5

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		obj-$(CONFIG_DMAR_TABLE) += dmar.o
		obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o cache.o prq.o
		obj-$(CONFIG_DMAR_TABLE) += trace.o
		obj-y += iommu.o pasid.o nested.o cache.o prq.o
		obj-$(CONFIG_DMAR_TABLE) += dmar.o trace.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