From 5c817171f9ba7325118fc02f5bf34d57994ca4b7 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 27 Jun 2008 10:48:16 +0200
Subject: [PATCH] --- yaml --- r: 99635 b: refs/heads/master c:
 92af4e29020ff096178a00605b3662b3b39d4aa9 h: refs/heads/master i:   99633:
 6fa30def90287410de5f10142ccf497eb395955d   99631:
 aac5263f1605c73b5352aa6e0f0ef904eee87878 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/kernel/amd_iommu.c      | 2 ++
 trunk/arch/x86/kernel/amd_iommu_init.c | 2 ++
 trunk/include/asm-x86/gart.h           | 5 +++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca04433bfc65..9fd730e886ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d2ba0a8a5816eb8322836271fbcb045d915dfd
+refs/heads/master: 92af4e29020ff096178a00605b3662b3b39d4aa9
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
index 134dea103247..a1b38561d347 100644
--- a/trunk/arch/x86/kernel/amd_iommu.c
+++ b/trunk/arch/x86/kernel/amd_iommu.c
@@ -937,8 +937,10 @@ int __init amd_iommu_init_dma_ops(void)
 	iommu_detected = 1;
 	force_iommu = 1;
 	bad_dma_address = 0;
+#ifdef CONFIG_GART_IOMMU
 	gart_iommu_aperture_disabled = 1;
 	gart_iommu_aperture = 0;
+#endif
 
 	dma_ops = &amd_iommu_dma_ops;
 
diff --git a/trunk/arch/x86/kernel/amd_iommu_init.c b/trunk/arch/x86/kernel/amd_iommu_init.c
index d1aa2344cd90..6ab8128db1cc 100644
--- a/trunk/arch/x86/kernel/amd_iommu_init.c
+++ b/trunk/arch/x86/kernel/amd_iommu_init.c
@@ -801,8 +801,10 @@ void __init amd_iommu_detect(void)
 
 	if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
 		iommu_detected = 1;
+#ifdef CONFIG_GART_IOMMU
 		gart_iommu_aperture_disabled = 1;
 		gart_iommu_aperture = 0;
+#endif
 	}
 }
 
diff --git a/trunk/include/asm-x86/gart.h b/trunk/include/asm-x86/gart.h
index 90958ed993fa..ec5785c6e2fd 100644
--- a/trunk/include/asm-x86/gart.h
+++ b/trunk/include/asm-x86/gart.h
@@ -18,8 +18,9 @@ extern int gart_iommu_aperture_allowed;
 extern int gart_iommu_aperture_disabled;
 extern int fix_aperture;
 #else
-#define gart_iommu_aperture 0
-#define gart_iommu_aperture_allowed 0
+#define gart_iommu_aperture		0
+#define gart_iommu_aperture_allowed	0
+#define gart_iommu_aperture_disabled	1
 
 static inline void early_gart_iommu_check(void)
 {