x86, AMD IOMMU, build fix #2

fix:

 arch/x86/kernel/amd_iommu.c: In function ‘amd_iommu_init_dma_ops':
 arch/x86/kernel/amd_iommu.c:940: error: lvalue required as left operand of assignment
 arch/x86/kernel/amd_iommu.c:941: error: lvalue required as left operand of assignment

due to !CONFIG_GART_IOMMU.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 134dea10324726d8c9f7d46b45ae3697bf5da070..a1b38561d34765363b9c02bfb432a15dc043809a 100644 (file)
--- a/arch/x86/kernel/amd_iommu.c
+++ b/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/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index d1aa2344cd90b087dd5040a0bb9759c0f2616e30..6ab8128db1ccc01e6fe1ed01dea4008f378592aa 100644 (file)
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/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/include/asm-x86/gart.h b/include/asm-x86/gart.h
index 90958ed993faa3d140c495911bb77a1c57037ee9..ec5785c6e2fdb7397d5a3ad425beeeb0be91ff3b 100644 (file)
--- a/include/asm-x86/gart.h
+++ b/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)
 {