iommu/vt-d: Move Intel IOMMU driver into subdirectory (672cf6df) · Commits · 戴 / test

MAINTAINERS

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

+6 −6

Original line number	Diff line number	Diff line
		@@ -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

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

+0 −0

File moved.