Skip to content

Commit ddcc66c

Browse files
DerDakonjoergroedel
authored andcommitted
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: ab65ba5 ("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>
1 parent 9548fef commit ddcc66c

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

drivers/iommu/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-y += amd/ intel/ arm/ iommufd/ riscv/
2+
obj-y += amd/ arm/ iommufd/ riscv/
3+
obj-$(CONFIG_INTEL_IOMMU) += intel/
34
obj-$(CONFIG_IOMMU_API) += iommu.o
45
obj-$(CONFIG_IOMMU_SUPPORT) += iommu-pages.o
56
obj-$(CONFIG_IOMMU_API) += iommu-traces.o

drivers/iommu/intel/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
obj-$(CONFIG_DMAR_TABLE) += dmar.o
3-
obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o cache.o prq.o
4-
obj-$(CONFIG_DMAR_TABLE) += trace.o
2+
obj-y += iommu.o pasid.o nested.o cache.o prq.o
3+
obj-$(CONFIG_DMAR_TABLE) += dmar.o trace.o
54
obj-$(CONFIG_DMAR_PERF) += perf.o
65
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
76
obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o
8-
ifdef CONFIG_INTEL_IOMMU
97
obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o
10-
endif
118
obj-$(CONFIG_INTEL_IOMMU_PERF_EVENTS) += perfmon.o

0 commit comments

Comments
 (0)