Skip to content

Commit 672cf6d

Browse files
committed
iommu/vt-d: Move Intel IOMMU driver into subdirectory
Move all files related to the Intel IOMMU driver into its own subdirectory. Signed-off-by: Joerg Roedel <[email protected]> Reviewed-by: Jerry Snitselaar <[email protected]> Reviewed-by: Lu Baolu <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ad8694b commit 672cf6d

File tree

10 files changed

+10
-11
lines changed

10 files changed

+10
-11
lines changed

MAINTAINERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8620,8 +8620,7 @@ M: Lu Baolu <[email protected]>
86208620
86218621
S: Supported
86228622
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
8623-
F: drivers/iommu/dmar.c
8624-
F: drivers/iommu/intel*.[ch]
8623+
F: drivers/iommu/intel/
86258624
F: include/linux/intel-iommu.h
86268625
F: include/linux/intel-svm.h
86278626

drivers/iommu/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o
1717
obj-$(CONFIG_ARM_SMMU) += arm_smmu.o
1818
arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o
1919
obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
20-
obj-$(CONFIG_DMAR_TABLE) += dmar.o
21-
obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o
22-
obj-$(CONFIG_INTEL_IOMMU) += intel-trace.o
23-
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel-iommu-debugfs.o
24-
obj-$(CONFIG_INTEL_IOMMU_SVM) += intel-svm.o
20+
obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o
21+
obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o
22+
obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o
23+
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o
24+
obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o
2525
obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o
26-
obj-$(CONFIG_IRQ_REMAP) += intel_irq_remapping.o irq_remapping.o
26+
obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o
2727
obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o
2828
obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o
2929
obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o
File renamed without changes.

drivers/iommu/dmar.c renamed to drivers/iommu/intel/dmar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <asm/irq_remapping.h>
3333
#include <asm/iommu_table.h>
3434

35-
#include "irq_remapping.h"
35+
#include "../irq_remapping.h"
3636

3737
typedef int (*dmar_res_handler_t)(struct acpi_dmar_header *, void *);
3838
struct dmar_res_callback {
File renamed without changes.

drivers/iommu/intel-iommu.c renamed to drivers/iommu/intel/iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#include <asm/iommu.h>
4848
#include <trace/events/intel_iommu.h>
4949

50-
#include "irq_remapping.h"
50+
#include "../irq_remapping.h"
5151
#include "intel-pasid.h"
5252

5353
#define ROOT_SIZE VTD_PAGE_SIZE

drivers/iommu/intel_irq_remapping.c renamed to drivers/iommu/intel/irq_remapping.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <asm/pci-direct.h>
2222
#include <asm/msidef.h>
2323

24-
#include "irq_remapping.h"
24+
#include "../irq_remapping.h"
2525

2626
enum irq_mode {
2727
IRQ_REMAPPING,
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)