diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2007-10-24 06:49:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-29 19:22:22 -0400 |
commit | 966396d3a05c8049fce5c81c49138e5ee1b05443 (patch) | |
tree | 11fff010a4aecd965bed52719d55d8fa4b40b055 /arch/x86 | |
parent | 395624fcddd178de01a78aa88670a86ec919de77 (diff) |
x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
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 <joerg.roedel@amd.com>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig.debug | 2 | ||||
-rw-r--r-- | arch/x86/Kconfig.x86_64 | 4 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 2 | ||||
-rw-r--r-- | arch/x86/kernel/Makefile_64 | 2 | ||||
-rw-r--r-- | arch/x86/kernel/early-quirks.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 970b2defe7df..fbd77b7dfd7f 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -91,7 +91,7 @@ config DOUBLEFAULT | |||
91 | 91 | ||
92 | config IOMMU_DEBUG | 92 | config IOMMU_DEBUG |
93 | bool "Enable IOMMU debugging" | 93 | bool "Enable IOMMU debugging" |
94 | depends on IOMMU && DEBUG_KERNEL | 94 | depends on GART_IOMMU && DEBUG_KERNEL |
95 | depends on X86_64 | 95 | depends on X86_64 |
96 | help | 96 | help |
97 | Force the IOMMU to on even when you have less than 4GB of | 97 | Force the IOMMU to on even when you have less than 4GB of |
diff --git a/arch/x86/Kconfig.x86_64 b/arch/x86/Kconfig.x86_64 index acb2949dbebc..60ac22769a40 100644 --- a/arch/x86/Kconfig.x86_64 +++ b/arch/x86/Kconfig.x86_64 | |||
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC | |||
479 | 479 | ||
480 | # Mark as embedded because too many people got it wrong. | 480 | # Mark as embedded because too many people got it wrong. |
481 | # The code disables itself when not needed. | 481 | # The code disables itself when not needed. |
482 | config IOMMU | 482 | config GART_IOMMU |
483 | bool "GART IOMMU support" if EMBEDDED | 483 | bool "GART IOMMU support" if EMBEDDED |
484 | default y | 484 | default y |
485 | select SWIOTLB | 485 | select SWIOTLB |
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz | |||
687 | 687 | ||
688 | config K8_NB | 688 | config K8_NB |
689 | def_bool y | 689 | def_bool y |
690 | depends on AGP_AMD64 || IOMMU || (PCI && NUMA) | 690 | depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA) |
691 | 691 | ||
692 | endmenu | 692 | endmenu |
693 | 693 | ||
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index b091c5e35558..38a83f9c966f 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y | |||
170 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 170 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
171 | CONFIG_HPET_TIMER=y | 171 | CONFIG_HPET_TIMER=y |
172 | CONFIG_HPET_EMULATE_RTC=y | 172 | CONFIG_HPET_EMULATE_RTC=y |
173 | CONFIG_IOMMU=y | 173 | CONFIG_GART_IOMMU=y |
174 | # CONFIG_CALGARY_IOMMU is not set | 174 | # CONFIG_CALGARY_IOMMU is not set |
175 | CONFIG_SWIOTLB=y | 175 | CONFIG_SWIOTLB=y |
176 | CONFIG_X86_MCE=y | 176 | CONFIG_X86_MCE=y |
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index 466337ae9a1e..24671c3838b3 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 | |||
25 | obj-$(CONFIG_PM) += suspend_64.o | 25 | obj-$(CONFIG_PM) += suspend_64.o |
26 | obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o | 26 | obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o |
27 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 27 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
28 | obj-$(CONFIG_IOMMU) += pci-gart_64.o aperture_64.o | 28 | obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o |
29 | obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o | 29 | obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o |
30 | obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o | 30 | obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o |
31 | obj-$(CONFIG_KPROBES) += kprobes_64.o | 31 | obj-$(CONFIG_KPROBES) += kprobes_64.o |
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 95e0de9a4e4b..b8265c1ea0d3 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
@@ -17,13 +17,13 @@ | |||
17 | #include <asm/io_apic.h> | 17 | #include <asm/io_apic.h> |
18 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
19 | 19 | ||
20 | #ifdef CONFIG_IOMMU | 20 | #ifdef CONFIG_GART_IOMMU |
21 | #include <asm/gart.h> | 21 | #include <asm/gart.h> |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | static void __init via_bugs(void) | 24 | static void __init via_bugs(void) |
25 | { | 25 | { |
26 | #ifdef CONFIG_IOMMU | 26 | #ifdef CONFIG_GART_IOMMU |
27 | if ((end_pfn > MAX_DMA32_PFN || force_iommu) && | 27 | if ((end_pfn > MAX_DMA32_PFN || force_iommu) && |
28 | !iommu_aperture_allowed) { | 28 | !iommu_aperture_allowed) { |
29 | printk(KERN_INFO | 29 | printk(KERN_INFO |
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index 730339fc00da..66b3dc5b3f45 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) | |||
275 | swiotlb = 1; | 275 | swiotlb = 1; |
276 | #endif | 276 | #endif |
277 | 277 | ||
278 | #ifdef CONFIG_IOMMU | 278 | #ifdef CONFIG_GART_IOMMU |
279 | gart_parse_options(p); | 279 | gart_parse_options(p); |
280 | #endif | 280 | #endif |
281 | 281 | ||
@@ -298,7 +298,7 @@ void __init pci_iommu_alloc(void) | |||
298 | * The order of these functions is important for | 298 | * The order of these functions is important for |
299 | * fall-back/fail-over reasons | 299 | * fall-back/fail-over reasons |
300 | */ | 300 | */ |
301 | #ifdef CONFIG_IOMMU | 301 | #ifdef CONFIG_GART_IOMMU |
302 | iommu_hole_init(); | 302 | iommu_hole_init(); |
303 | #endif | 303 | #endif |
304 | 304 | ||
@@ -321,7 +321,7 @@ static int __init pci_iommu_init(void) | |||
321 | 321 | ||
322 | intel_iommu_init(); | 322 | intel_iommu_init(); |
323 | 323 | ||
324 | #ifdef CONFIG_IOMMU | 324 | #ifdef CONFIG_GART_IOMMU |
325 | gart_iommu_init(); | 325 | gart_iommu_init(); |
326 | #endif | 326 | #endif |
327 | 327 | ||