[PATCH 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-24 Thread Joerg Roedel 
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.

Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>
Acked-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>
---
 arch/x86/kernel/Makefile_64|2 +-
 arch/x86/kernel/early-quirks.c |4 ++--
 arch/x86/kernel/pci-dma_64.c   |6 +++---
 arch/x86_64/Kconfig|4 ++--
 arch/x86_64/Kconfig.debug  |2 +-
 arch/x86_64/defconfig  |2 +-
 drivers/char/agp/Kconfig   |4 ++--
 drivers/char/agp/amd64-agp.c   |2 +-
 drivers/usb/core/message.c |2 +-
 include/asm-x86/gart.h |2 +-
 include/asm-x86/pci_64.h   |2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index 466337a..24671c3 100644
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -25,7 +25,7 @@ obj-$(CONFIG_CRASH_DUMP)  += crash_dump_64.o
 obj-$(CONFIG_PM)   += suspend_64.o
 obj-$(CONFIG_HIBERNATION)  += suspend_asm_64.o
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_IOMMU)+= pci-gart_64.o aperture_64.o
+obj-$(CONFIG_GART_IOMMU)   += pci-gart_64.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)  += pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)  += kprobes_64.o
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 4770273..5330745 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -17,13 +17,13 @@
 #include 
 #include 
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
 #include 
 #endif
 
 static void __init via_bugs(void)
 {
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&
!iommu_aperture_allowed) {
printk(KERN_INFO
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 730339f..66b3dc5 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p)
swiotlb = 1;
 #endif
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
 #endif
 
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void)
 * The order of these functions is important for
 * fall-back/fail-over reasons
 */
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
iommu_hole_init();
 #endif
 
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void)
 
intel_iommu_init();
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
 #endif
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 3fc9e37..a5b4356 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
-config IOMMU
+config GART_IOMMU
bool "GART IOMMU support" if EMBEDDED
default y
select SWIOTLB
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz
 
 config K8_NB
def_bool y
-   depends on AGP_AMD64 || IOMMU || (PCI && NUMA)
+   depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA)
 
 endmenu
 
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index 775d211..6035468 100644
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -17,7 +17,7 @@ config DEBUG_RODATA
 If in doubt, say "N".
 
 config IOMMU_DEBUG
-   depends on IOMMU && DEBUG_KERNEL
+   depends on GART_IOMMU && DEBUG_KERNEL
bool "Enable IOMMU debugging"
help
  Force the IOMMU to on even when you have less than 4GB of
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b091c5e..38a83f9 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_IOMMU=y
+CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index f22c253..ccb1fa8 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,9 @@ config AGP_AMD
  X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
-   tristate "AMD Opteron/Athlon64 on-CPU GART support" if !IOMMU
+   tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
depends on AGP && X86
-   default y if IOMMU
+   default y if GART_IOMMU
help
  This option gives you AGP support for the GLX component of
  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index d95662e..d8200ac 100644
--- a/drivers/char/agp/amd64-agp.c
+++

[PATCH 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-24 Thread Joerg Roedel 
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.

Signed-off-by: Joerg Roedel [EMAIL PROTECTED]
Acked-by: Muli Ben-Yehuda [EMAIL PROTECTED]
---
 arch/x86/kernel/Makefile_64|2 +-
 arch/x86/kernel/early-quirks.c |4 ++--
 arch/x86/kernel/pci-dma_64.c   |6 +++---
 arch/x86_64/Kconfig|4 ++--
 arch/x86_64/Kconfig.debug  |2 +-
 arch/x86_64/defconfig  |2 +-
 drivers/char/agp/Kconfig   |4 ++--
 drivers/char/agp/amd64-agp.c   |2 +-
 drivers/usb/core/message.c |2 +-
 include/asm-x86/gart.h |2 +-
 include/asm-x86/pci_64.h   |2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index 466337a..24671c3 100644
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -25,7 +25,7 @@ obj-$(CONFIG_CRASH_DUMP)  += crash_dump_64.o
 obj-$(CONFIG_PM)   += suspend_64.o
 obj-$(CONFIG_HIBERNATION)  += suspend_asm_64.o
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_IOMMU)+= pci-gart_64.o aperture_64.o
+obj-$(CONFIG_GART_IOMMU)   += pci-gart_64.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)  += pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)  += kprobes_64.o
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 4770273..5330745 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -17,13 +17,13 @@
 #include asm/io_apic.h
 #include asm/apic.h
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
 #include asm/gart.h
 #endif
 
 static void __init via_bugs(void)
 {
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
if ((end_pfn  MAX_DMA32_PFN ||  force_iommu) 
!iommu_aperture_allowed) {
printk(KERN_INFO
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 730339f..66b3dc5 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p)
swiotlb = 1;
 #endif
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
 #endif
 
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void)
 * The order of these functions is important for
 * fall-back/fail-over reasons
 */
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
iommu_hole_init();
 #endif
 
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void)
 
intel_iommu_init();
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
 #endif
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 3fc9e37..a5b4356 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
-config IOMMU
+config GART_IOMMU
bool GART IOMMU support if EMBEDDED
default y
select SWIOTLB
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz
 
 config K8_NB
def_bool y
-   depends on AGP_AMD64 || IOMMU || (PCI  NUMA)
+   depends on AGP_AMD64 || GART_IOMMU || (PCI  NUMA)
 
 endmenu
 
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index 775d211..6035468 100644
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -17,7 +17,7 @@ config DEBUG_RODATA
 If in doubt, say N.
 
 config IOMMU_DEBUG
-   depends on IOMMU  DEBUG_KERNEL
+   depends on GART_IOMMU  DEBUG_KERNEL
bool Enable IOMMU debugging
help
  Force the IOMMU to on even when you have less than 4GB of
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b091c5e..38a83f9 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_IOMMU=y
+CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index f22c253..ccb1fa8 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,9 @@ config AGP_AMD
  X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
-   tristate AMD Opteron/Athlon64 on-CPU GART support if !IOMMU
+   tristate AMD Opteron/Athlon64 on-CPU GART support if !GART_IOMMU
depends on AGP  X86
-   default y if IOMMU
+   default y if GART_IOMMU
help
  This option gives you AGP support for the GLX component of
  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index d95662e..d8200ac 100644
--- a/drivers/char/agp/amd64-agp.c
+++

Re: [PATCH 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-23 Thread Muli Ben-Yehuda 
On Tue, Oct 23, 2007 at 07:41:31PM +0200, Joerg Roedel wrote:
> This patch renames the IOMMU config option to GART_IOMMU because in fact it
> means the GART and not general support for an IOMMU on x86.
> 
> Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>

Acked-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>

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 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-23 Thread Joerg Roedel 
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.

Signed-off-by: Joerg Roedel <[EMAIL PROTECTED]>
---
 arch/x86/kernel/Makefile_64|2 +-
 arch/x86/kernel/early-quirks.c |2 +-
 arch/x86/kernel/pci-dma_64.c   |6 +++---
 arch/x86_64/Kconfig|4 ++--
 arch/x86_64/Kconfig.debug  |2 +-
 arch/x86_64/defconfig  |2 +-
 drivers/char/agp/Kconfig   |4 ++--
 drivers/char/agp/amd64-agp.c   |2 +-
 drivers/usb/core/message.c |2 +-
 include/asm-x86/gart.h |2 +-
 include/asm-x86/pci_64.h   |2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index dec06e7..02cfd08 100644
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM)  += suspend_64.o
 obj-$(CONFIG_HIBERNATION)  += suspend_asm_64.o
 obj-$(CONFIG_CPU_FREQ) += cpu/cpufreq/
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_IOMMU)+= pci-gart_64.o aperture_64.o
+obj-$(CONFIG_GART_IOMMU)   += pci-gart_64.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)  += pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)  += kprobes_64.o
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index d6e6e83..5330745 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -23,7 +23,7 @@
 
 static void __init via_bugs(void)
 {
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&
!iommu_aperture_allowed) {
printk(KERN_INFO
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 730339f..66b3dc5 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p)
swiotlb = 1;
 #endif
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
 #endif
 
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void)
 * The order of these functions is important for
 * fall-back/fail-over reasons
 */
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
iommu_hole_init();
 #endif
 
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void)
 
intel_iommu_init();
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
 #endif
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 198adad..b986b27 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
-config IOMMU
+config GART_IOMMU
bool "GART IOMMU support" if EMBEDDED
default y
select SWIOTLB
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz
 
 config K8_NB
def_bool y
-   depends on AGP_AMD64 || IOMMU || (PCI && NUMA)
+   depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA)
 
 endmenu
 
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index 775d211..6035468 100644
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -17,7 +17,7 @@ config DEBUG_RODATA
 If in doubt, say "N".
 
 config IOMMU_DEBUG
-   depends on IOMMU && DEBUG_KERNEL
+   depends on GART_IOMMU && DEBUG_KERNEL
bool "Enable IOMMU debugging"
help
  Force the IOMMU to on even when you have less than 4GB of
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b091c5e..38a83f9 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_IOMMU=y
+CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index f22c253..ccb1fa8 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,9 @@ config AGP_AMD
  X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
-   tristate "AMD Opteron/Athlon64 on-CPU GART support" if !IOMMU
+   tristate "AMD Opteron/Athlon64 on-CPU GART support" if !GART_IOMMU
depends on AGP && X86
-   default y if IOMMU
+   default y if GART_IOMMU
help
  This option gives you AGP support for the GLX component of
  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index d95662e..d8200ac 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -787,7 +787,7 @@ static void __exit agp_amd64_cleanup(void)
 
 /* On AMD64 the PCI driver needs to initialize this driver early

[PATCH 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-23 Thread Joerg Roedel 
This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.

Signed-off-by: Joerg Roedel [EMAIL PROTECTED]
---
 arch/x86/kernel/Makefile_64|2 +-
 arch/x86/kernel/early-quirks.c |2 +-
 arch/x86/kernel/pci-dma_64.c   |6 +++---
 arch/x86_64/Kconfig|4 ++--
 arch/x86_64/Kconfig.debug  |2 +-
 arch/x86_64/defconfig  |2 +-
 drivers/char/agp/Kconfig   |4 ++--
 drivers/char/agp/amd64-agp.c   |2 +-
 drivers/usb/core/message.c |2 +-
 include/asm-x86/gart.h |2 +-
 include/asm-x86/pci_64.h   |2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
index dec06e7..02cfd08 100644
--- a/arch/x86/kernel/Makefile_64
+++ b/arch/x86/kernel/Makefile_64
@@ -29,7 +29,7 @@ obj-$(CONFIG_PM)  += suspend_64.o
 obj-$(CONFIG_HIBERNATION)  += suspend_asm_64.o
 obj-$(CONFIG_CPU_FREQ) += cpu/cpufreq/
 obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_IOMMU)+= pci-gart_64.o aperture_64.o
+obj-$(CONFIG_GART_IOMMU)   += pci-gart_64.o aperture_64.o
 obj-$(CONFIG_CALGARY_IOMMU)+= pci-calgary_64.o tce_64.o
 obj-$(CONFIG_SWIOTLB)  += pci-swiotlb_64.o
 obj-$(CONFIG_KPROBES)  += kprobes_64.o
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index d6e6e83..5330745 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -23,7 +23,7 @@
 
 static void __init via_bugs(void)
 {
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
if ((end_pfn  MAX_DMA32_PFN ||  force_iommu) 
!iommu_aperture_allowed) {
printk(KERN_INFO
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index 730339f..66b3dc5 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -275,7 +275,7 @@ __init int iommu_setup(char *p)
swiotlb = 1;
 #endif
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
 #endif
 
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void)
 * The order of these functions is important for
 * fall-back/fail-over reasons
 */
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
iommu_hole_init();
 #endif
 
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void)
 
intel_iommu_init();
 
-#ifdef CONFIG_IOMMU
+#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
 #endif
 
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 198adad..b986b27 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC
 
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
-config IOMMU
+config GART_IOMMU
bool GART IOMMU support if EMBEDDED
default y
select SWIOTLB
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz
 
 config K8_NB
def_bool y
-   depends on AGP_AMD64 || IOMMU || (PCI  NUMA)
+   depends on AGP_AMD64 || GART_IOMMU || (PCI  NUMA)
 
 endmenu
 
diff --git a/arch/x86_64/Kconfig.debug b/arch/x86_64/Kconfig.debug
index 775d211..6035468 100644
--- a/arch/x86_64/Kconfig.debug
+++ b/arch/x86_64/Kconfig.debug
@@ -17,7 +17,7 @@ config DEBUG_RODATA
 If in doubt, say N.
 
 config IOMMU_DEBUG
-   depends on IOMMU  DEBUG_KERNEL
+   depends on GART_IOMMU  DEBUG_KERNEL
bool Enable IOMMU debugging
help
  Force the IOMMU to on even when you have less than 4GB of
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b091c5e..38a83f9 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
-CONFIG_IOMMU=y
+CONFIG_GART_IOMMU=y
 # CONFIG_CALGARY_IOMMU is not set
 CONFIG_SWIOTLB=y
 CONFIG_X86_MCE=y
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index f22c253..ccb1fa8 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -56,9 +56,9 @@ config AGP_AMD
  X on AMD Irongate, 761, and 762 chipsets.
 
 config AGP_AMD64
-   tristate AMD Opteron/Athlon64 on-CPU GART support if !IOMMU
+   tristate AMD Opteron/Athlon64 on-CPU GART support if !GART_IOMMU
depends on AGP  X86
-   default y if IOMMU
+   default y if GART_IOMMU
help
  This option gives you AGP support for the GLX component of
  X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs.
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index d95662e..d8200ac 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -787,7 +787,7 @@ static void __exit agp_amd64_cleanup(void)
 
 /* On AMD64 the PCI driver needs to initialize this driver early
for the IOMMU, so it has

Re: [PATCH 2/4] x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU

2007-10-23 Thread Muli Ben-Yehuda 
On Tue, Oct 23, 2007 at 07:41:31PM +0200, Joerg Roedel wrote:
 This patch renames the IOMMU config option to GART_IOMMU because in fact it
 means the GART and not general support for an IOMMU on x86.
 
 Signed-off-by: Joerg Roedel [EMAIL PROTECTED]

Acked-by: Muli Ben-Yehuda [EMAIL PROTECTED]

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/