diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/iommu/Makefile | 12 | ||||
| -rw-r--r-- | drivers/iommu/intel/debugfs.c (renamed from drivers/iommu/intel-iommu-debugfs.c) | 0 | ||||
| -rw-r--r-- | drivers/iommu/intel/dmar.c (renamed from drivers/iommu/dmar.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel/intel-pasid.h (renamed from drivers/iommu/intel-pasid.h) | 0 | ||||
| -rw-r--r-- | drivers/iommu/intel/iommu.c (renamed from drivers/iommu/intel-iommu.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel/irq_remapping.c (renamed from drivers/iommu/intel_irq_remapping.c) | 2 | ||||
| -rw-r--r-- | drivers/iommu/intel/pasid.c (renamed from drivers/iommu/intel-pasid.c) | 0 | ||||
| -rw-r--r-- | drivers/iommu/intel/svm.c (renamed from drivers/iommu/intel-svm.c) | 0 | ||||
| -rw-r--r-- | drivers/iommu/intel/trace.c (renamed from drivers/iommu/intel-trace.c) | 0 |
10 files changed, 10 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dd59ec6676d9..52ab5329becd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8620,8 +8620,7 @@ M: Lu Baolu <baolu.lu@linux.intel.com> L: iommu@lists.linux-foundation.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git -F: drivers/iommu/dmar.c -F: drivers/iommu/intel*.[ch] +F: drivers/iommu/intel/ F: include/linux/intel-iommu.h F: include/linux/intel-svm.h diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 3af7e374b0cb..342190196dfb 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -17,13 +17,13 @@ obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o obj-$(CONFIG_ARM_SMMU) += arm_smmu.o arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o -obj-$(CONFIG_DMAR_TABLE) += dmar.o -obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o -obj-$(CONFIG_INTEL_IOMMU) += intel-trace.o -obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel-iommu-debugfs.o -obj-$(CONFIG_INTEL_IOMMU_SVM) += intel-svm.o +obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o +obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o +obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o +obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o +obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o -obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o +obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o diff --git a/drivers/iommu/intel-iommu-debugfs.c b/drivers/iommu/intel/debugfs.c index cf1ebb98e418..cf1ebb98e418 100644 --- a/drivers/iommu/intel-iommu-debugfs.c +++ b/drivers/iommu/intel/debugfs.c diff --git a/drivers/iommu/dmar.c b/drivers/iommu/intel/dmar.c index 60a2970c37ff..cc46dff98fa0 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -32,7 +32,7 @@ #include <asm/irq_remapping.h> #include <asm/iommu_table.h> -#include "irq_remapping.h" +#include "../irq_remapping.h" typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *); struct dmar_res_callback { diff --git a/drivers/iommu/intel-pasid.h b/drivers/iommu/intel/intel-pasid.h index c5318d40e0fa..c5318d40e0fa 100644 --- a/drivers/iommu/intel-pasid.h +++ b/drivers/iommu/intel/intel-pasid.h diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel/iommu.c index 648a785e078a..9129663a7406 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -47,7 +47,7 @@ #include <asm/iommu.h> #include <trace/events/intel_iommu.h> -#include "irq_remapping.h" +#include "../irq_remapping.h" #include "intel-pasid.h" #define ROOT_SIZE VTD_PAGE_SIZE diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel/irq_remapping.c index a042f123b091..7f8769800815 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -21,7 +21,7 @@ #include <asm/pci-direct.h> #include <asm/msidef.h> -#include "irq_remapping.h" +#include "../irq_remapping.h" enum irq_mode { IRQ_REMAPPING, diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel/pasid.c index c81f0f17c6ba..c81f0f17c6ba 100644 --- a/drivers/iommu/intel-pasid.c +++ b/drivers/iommu/intel/pasid.c diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel/svm.c index a035ef911fba..a035ef911fba 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel/svm.c diff --git a/drivers/iommu/intel-trace.c b/drivers/iommu/intel/trace.c index bfb6a6e37a88..bfb6a6e37a88 100644 --- a/drivers/iommu/intel-trace.c +++ b/drivers/iommu/intel/trace.c |