]> err.no Git - linux-2.6/commitdiff
x86: make only GART code include gart.h
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Fri, 11 Jul 2008 01:23:42 +0000 (10:23 +0900)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 09:00:54 +0000 (11:00 +0200)
gart.h has only GART-specific stuff. Only GART code needs it. Other
IOMMU stuff should include iommu.h instead of gart.h.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
12 files changed:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
arch/x86/kernel/aperture_64.c
arch/x86/kernel/early-quirks.c
arch/x86/kernel/pci-calgary_64.c
arch/x86/kernel/pci-dma.c
arch/x86/kernel/pci-gart_64.c
arch/x86/kernel/pci-nommu.c
arch/x86/kernel/pci-swiotlb_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/gart.h

index f2766d84c7a00c78c4f24951a7f2912f550ef475..cf2f74bcde53aa94bec66dc935d1b87e655dbd02 100644 (file)
@@ -23,7 +23,7 @@
 #include <linux/scatterlist.h>
 #include <linux/iommu-helper.h>
 #include <asm/proto.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/amd_iommu_types.h>
 #include <asm/amd_iommu.h>
 
index 2a13e430437dc5f1e05793aa995df4befcbc8938..66438284c69956b5b2d1e436ed027151c6b834ef 100644 (file)
@@ -25,7 +25,7 @@
 #include <asm/pci-direct.h>
 #include <asm/amd_iommu_types.h>
 #include <asm/amd_iommu.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 
 /*
  * definitions for the ACPI scanning code
index 9f907806c1a53d58f9be603bb18bdcb60f14c6c2..44e21826db1145a00659c89c5c45232ff3e70d2a 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/suspend.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>
index a4665f37cfc5dc9f3d3b7097c08166d061643de6..510b8e367732bffa2fa4804109dbc62f4755f2a5 100644 (file)
 #include <asm/dma.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
-
-#ifdef CONFIG_GART_IOMMU
-#include <asm/gart.h>
-#endif
+#include <asm/iommu.h>
 
 static void __init fix_hypertransport_config(int num, int slot, int func)
 {
index 6959b5c45df4546f28c2ef962fdc197d7afbfe3a..151f2d171f7c7386b7a14f574d4c7f34edfab0f3 100644 (file)
@@ -36,7 +36,7 @@
 #include <linux/delay.h>
 #include <linux/scatterlist.h>
 #include <linux/iommu-helper.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/calgary.h>
 #include <asm/tce.h>
 #include <asm/pci-direct.h>
index 8467ec2320f178584afb402cfb2b48859a3eb48e..f581a4b63b43788c2d957cbbdda39f05c57b9e6b 100644 (file)
@@ -5,7 +5,7 @@
 
 #include <asm/proto.h>
 #include <asm/dma.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/calgary.h>
 #include <asm/amd_iommu.h>
 
index d0d18db5d2a4809c72126d665d92843267147297..949ca985deb061edd7ad05ba1cca2504002afb07 100644 (file)
@@ -32,6 +32,7 @@
 #include <asm/mtrr.h>
 #include <asm/pgtable.h>
 #include <asm/proto.h>
+#include <asm/iommu.h>
 #include <asm/gart.h>
 #include <asm/cacheflush.h>
 #include <asm/swiotlb.h>
index aec43d56f49c57cedffaefad7205fbbfe9b984c2..792b9179eff315ecf3ae26e7e1635073e1a42c26 100644 (file)
@@ -7,7 +7,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/processor.h>
 #include <asm/dma.h>
 
index 82299cd1d04d452fea6ba6069fb3297a8824f7de..20df839b9c2012c12fa082c7b42ada6e63879a87 100644 (file)
@@ -5,7 +5,7 @@
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/swiotlb.h>
 #include <asm/dma.h>
 
index 86fc2d62427053a1a72eac7ded6c4bfd4b8a9f14..e5d208934bfc153789aeedac922d40e3b04c879d 100644 (file)
@@ -96,7 +96,7 @@
 #include <asm/smp.h>
 #include <asm/desc.h>
 #include <asm/dma.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include <asm/mmu_context.h>
 #include <asm/proto.h>
 
index bb0642318a959453e9ef0c68190070ac7d9290a4..7868065f6f2d132f59096694366c039d5e851b2d 100644 (file)
@@ -37,7 +37,7 @@
 #include "intel-iommu.h"
 #include <asm/proto.h> /* force_iommu in this header in x86-64*/
 #include <asm/cacheflush.h>
-#include <asm/gart.h>
+#include <asm/iommu.h>
 #include "pci.h"
 
 #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
index 33b9aeeb35a2367ba5deb1092622c579c6431c5a..3f62a83887f32c21c0919dd5c255847a8e6c2740 100644 (file)
@@ -2,7 +2,6 @@
 #define _ASM_X8664_GART_H 1
 
 #include <asm/e820.h>
-#include <asm/iommu.h>
 
 extern void set_up_gart_resume(u32, u32);