aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/pci-dma.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-07-10 21:23:43 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-11 05:00:54 -0400
commitac7ded2adb2e43152fe7385ddd53bf45f5c92285 (patch)
treea9698c49442b8d40f6c49cad029608b685ee9e61 /arch/x86/kernel/pci-dma.c
parent46a7fa270afbe5fddc6042a598cfe22977b0e989 (diff)
x86: remove ifdef CONFIG_GART_IOMMU in pci-dma.c
Our way to handle gart_* functions for CONFIG_GART_IOMMU and !CONFIG_GART_IOMMU cases is inconsistent. We have some dummy gart_* functions in !CONFIG_GART_IOMMU case and also use ifdef CONFIG_GART_IOMMU tricks in pci-dma.c to call some gart_* functions in only CONFIG_GART_IOMMU case. This patch removes ifdef CONFIG_GART_IOMMU in pci-dma.c and always use dummy gart_* functions in iommu.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>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r--arch/x86/kernel/pci-dma.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index f581a4b63b43..dd57c5bbe2da 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -114,9 +114,7 @@ void __init pci_iommu_alloc(void)
114 * The order of these functions is important for 114 * The order of these functions is important for
115 * fall-back/fail-over reasons 115 * fall-back/fail-over reasons
116 */ 116 */
117#ifdef CONFIG_GART_IOMMU
118 gart_iommu_hole_init(); 117 gart_iommu_hole_init();
119#endif
120 118
121#ifdef CONFIG_CALGARY_IOMMU 119#ifdef CONFIG_CALGARY_IOMMU
122 detect_calgary(); 120 detect_calgary();
@@ -184,9 +182,7 @@ static __init int iommu_setup(char *p)
184 swiotlb = 1; 182 swiotlb = 1;
185#endif 183#endif
186 184
187#ifdef CONFIG_GART_IOMMU
188 gart_parse_options(p); 185 gart_parse_options(p);
189#endif
190 186
191#ifdef CONFIG_CALGARY_IOMMU 187#ifdef CONFIG_CALGARY_IOMMU
192 if (!strncmp(p, "calgary", 7)) 188 if (!strncmp(p, "calgary", 7))
@@ -508,9 +504,7 @@ static int __init pci_iommu_init(void)
508 504
509 amd_iommu_init(); 505 amd_iommu_init();
510 506
511#ifdef CONFIG_GART_IOMMU
512 gart_iommu_init(); 507 gart_iommu_init();
513#endif
514 508
515 no_iommu_init(); 509 no_iommu_init();
516 return 0; 510 return 0;