Re: [PATCH] x86: rename iommu.h to gart.h
On Fri, Oct 19, 2007 at 02:40:25PM +0200, Muli Ben-Yehuda wrote: > On Fri, Oct 19, 2007 at 02:38:11PM +0200, Joerg Roedel wrote: > > > 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. > > Long overdue IMHO. How about also renaming the config option to > CONFIG_GART_IOMMU while you're at it? Right. The exported function and variable names need also a rename in some cases. I'll prepare a new patch for that to keep the patches small. Joerg -- | AMD Saxony Limited Liability Company & Co. KG Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany System| Register Court Dresden: HRA 4896 Research | General Partner authorized to represent: Center| AMD Saxony LLC (Wilmington, Delaware, US) | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86: rename iommu.h to gart.h
On Fri, Oct 19, 2007 at 02:38:11PM +0200, Joerg Roedel wrote: > 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. Long overdue IMHO. How about also renaming the config option to CONFIG_GART_IOMMU while you're at it? Cheers, Muli -- SYSTOR 2007 --- 1st Annual Haifa Systems and Storage Conference 2007 http://www.haifa.il.ibm.com/Workshops/systor2007/ Virtualization workshop: Oct 29th, 2007 | Storage workshop: Oct 30th, 2007 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] x86: 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: Joerg Roedel <[EMAIL PROTECTED]>
---
arch/x86/kernel/aperture_64.c |2 +-
arch/x86/kernel/early-quirks_64.c |2 +-
arch/x86/kernel/pci-calgary_64.c|2 +-
arch/x86/kernel/pci-dma_64.c|2 +-
arch/x86/kernel/pci-gart_64.c |2 +-
arch/x86/kernel/pci-nommu_64.c |2 +-
arch/x86/kernel/pci-swiotlb_64.c|2 +-
arch/x86/kernel/reboot_64.c |2 +-
arch/x86_64/Kconfig |2 +-
include/asm-x86/{iommu.h => gart.h} |0
10 files changed, 9 insertions(+), 9 deletions(-)
rename include/asm-x86/{iommu.h => gart.h} (100%)
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 8f681ca..70c854f 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/arch/x86/kernel/early-quirks_64.c
b/arch/x86/kernel/early-quirks_64.c
index 13aa4fd..8f0226e 100644
--- a/arch/x86/kernel/early-quirks_64.c
+++ b/arch/x86/kernel/early-quirks_64.c
@@ -14,7 +14,7 @@
#include
#include
#include
-#include
+#include
#include
static void __init via_bugs(void)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 5098f58..c6d9de5 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -36,7 +36,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index b2b42bd..176e87d 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -8,7 +8,7 @@
#include
#include
#include
-#include
+#include
#include
int iommu_merge __read_mostly = 0;
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 5cdfab6..25f0c80 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -30,7 +30,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c
index e85d436..8e768d2 100644
--- a/arch/x86/kernel/pci-nommu_64.c
+++ b/arch/x86/kernel/pci-nommu_64.c
@@ -7,7 +7,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index b2f405e..102866d 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -5,7 +5,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c
index 368db2b..ab56e02 100644
--- a/arch/x86/kernel/reboot_64.c
+++ b/arch/x86/kernel/reboot_64.c
@@ -16,7 +16,7 @@
#include
#include
#include
-#include
+#include
/*
* Power off function, if any
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 78cb68f..00d73d4 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -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
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/gart.h
similarity index 100%
rename from include/asm-x86/iommu.h
rename to include/asm-x86/gart.h
--
1.5.2.5
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86: rename iommu.h to gart.h
On Fri, Oct 19, 2007 at 02:40:25PM +0200, Muli Ben-Yehuda wrote: On Fri, Oct 19, 2007 at 02:38:11PM +0200, Joerg Roedel wrote: 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. Long overdue IMHO. How about also renaming the config option to CONFIG_GART_IOMMU while you're at it? Right. The exported function and variable names need also a rename in some cases. I'll prepare a new patch for that to keep the patches small. Joerg -- | AMD Saxony Limited Liability Company Co. KG Operating | Wilschdorfer Landstr. 101, 01109 Dresden, Germany System| Register Court Dresden: HRA 4896 Research | General Partner authorized to represent: Center| AMD Saxony LLC (Wilmington, Delaware, US) | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] x86: rename iommu.h to gart.h
On Fri, Oct 19, 2007 at 02:38:11PM +0200, Joerg Roedel wrote: 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. Long overdue IMHO. How about also renaming the config option to CONFIG_GART_IOMMU while you're at it? Cheers, Muli -- SYSTOR 2007 --- 1st Annual Haifa Systems and Storage Conference 2007 http://www.haifa.il.ibm.com/Workshops/systor2007/ Virtualization workshop: Oct 29th, 2007 | Storage workshop: Oct 30th, 2007 - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] x86: 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: Joerg Roedel [EMAIL PROTECTED]
---
arch/x86/kernel/aperture_64.c |2 +-
arch/x86/kernel/early-quirks_64.c |2 +-
arch/x86/kernel/pci-calgary_64.c|2 +-
arch/x86/kernel/pci-dma_64.c|2 +-
arch/x86/kernel/pci-gart_64.c |2 +-
arch/x86/kernel/pci-nommu_64.c |2 +-
arch/x86/kernel/pci-swiotlb_64.c|2 +-
arch/x86/kernel/reboot_64.c |2 +-
arch/x86_64/Kconfig |2 +-
include/asm-x86/{iommu.h = gart.h} |0
10 files changed, 9 insertions(+), 9 deletions(-)
rename include/asm-x86/{iommu.h = gart.h} (100%)
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 8f681ca..70c854f 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -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
diff --git a/arch/x86/kernel/early-quirks_64.c
b/arch/x86/kernel/early-quirks_64.c
index 13aa4fd..8f0226e 100644
--- a/arch/x86/kernel/early-quirks_64.c
+++ b/arch/x86/kernel/early-quirks_64.c
@@ -14,7 +14,7 @@
#include linux/pci_ids.h
#include asm/pci-direct.h
#include asm/proto.h
-#include asm/iommu.h
+#include asm/gart.h
#include asm/dma.h
static void __init via_bugs(void)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index 5098f58..c6d9de5 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -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
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index b2b42bd..176e87d 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -8,7 +8,7 @@
#include linux/pci.h
#include linux/module.h
#include asm/io.h
-#include asm/iommu.h
+#include asm/gart.h
#include asm/calgary.h
int iommu_merge __read_mostly = 0;
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 5cdfab6..25f0c80 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -30,7 +30,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
#include asm/dma.h
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu_64.c
index e85d436..8e768d2 100644
--- a/arch/x86/kernel/pci-nommu_64.c
+++ b/arch/x86/kernel/pci-nommu_64.c
@@ -7,7 +7,7 @@
#include linux/dma-mapping.h
#include linux/scatterlist.h
-#include asm/iommu.h
+#include asm/gart.h
#include asm/processor.h
#include asm/dma.h
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index b2f405e..102866d 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -5,7 +5,7 @@
#include linux/module.h
#include linux/dma-mapping.h
-#include asm/iommu.h
+#include asm/gart.h
#include asm/swiotlb.h
#include asm/dma.h
diff --git a/arch/x86/kernel/reboot_64.c b/arch/x86/kernel/reboot_64.c
index 368db2b..ab56e02 100644
--- a/arch/x86/kernel/reboot_64.c
+++ b/arch/x86/kernel/reboot_64.c
@@ -16,7 +16,7 @@
#include asm/pgtable.h
#include asm/tlbflush.h
#include asm/apic.h
-#include asm/iommu.h
+#include asm/gart.h
/*
* Power off function, if any
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 78cb68f..00d73d4 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -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
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/gart.h
similarity index 100%
rename from include/asm-x86/iommu.h
rename to include/asm-x86/gart.h
--
1.5.2.5
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
