Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86b9523a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'gart/rename' of... 

Merge branch 'gart/rename' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
parents 2c14ddc1 fffcda11

Documentation/x86/x86_64/boot-options.txt

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ IOMMU (input/output memory management unit) 
      (e.g. because you have < 3 GB memory).

      Kernel boot message: "PCI-DMA: Disabling IOMMU"



   2. <arch/x86_64/kernel/pci-gart.c>: AMD GART based hardware IOMMU.

   2. <arch/x86/kernel/amd_gart_64.c>: AMD GART based hardware IOMMU.

      Kernel boot message: "PCI-DMA: using GART IOMMU"



   3. <arch/x86_64/kernel/pci-swiotlb.c> : Software IOMMU implementation. Used

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ obj-$(CONFIG_OF) += devicetree.o 
ifeq ($(CONFIG_X86_64),y)

	obj-$(CONFIG_AUDIT)		+= audit_64.o



	obj-$(CONFIG_GART_IOMMU)	+= pci-gart_64.o aperture_64.o

	obj-$(CONFIG_GART_IOMMU)	+= amd_gart_64.o aperture_64.o

	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o

	obj-$(CONFIG_AMD_IOMMU)		+= amd_iommu_init.o amd_iommu.o