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

Commit 395624fc authored by Joerg Roedel's avatar Joerg Roedel Committed by Thomas Gleixner
Browse files

x86 gart: rename iommu.h to gart.h 



This patch renames the include file asm-x86/iommu.h to asm-x86/gart.h to make
clear to which IOMMU implementation it belongs. The patch also adds "GART" to
the Kconfig line.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e1054b39

arch/x86/Kconfig.x86_64

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ config HPET_EMULATE_RTC 
# Mark as embedded because too many people got it wrong.

# The code disables itself when not needed.

config IOMMU

	bool "IOMMU support" if EMBEDDED

	bool "GART IOMMU support" if EMBEDDED

	default y

	select SWIOTLB

	select AGP

arch/x86/kernel/aperture_64.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/ioport.h>

#include <asm/e820.h>

#include <asm/io.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/pci-direct.h>

#include <asm/dma.h>

#include <asm/k8.h>

arch/x86/kernel/early-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/apic.h>



#ifdef CONFIG_IOMMU

#include <asm/iommu.h>

#include <asm/gart.h>

#endif



static void __init via_bugs(void)

arch/x86/kernel/pci-calgary_64.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/pci.h>

#include <linux/delay.h>

#include <linux/scatterlist.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/calgary.h>

#include <asm/tce.h>

#include <asm/pci-direct.h>

arch/x86/kernel/pci-dma_64.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/module.h>

#include <linux/dmar.h>

#include <asm/io.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/calgary.h>



int iommu_merge __read_mostly = 1;