Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92af4e29 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 24d2ba0a

arch/x86/kernel/amd_iommu.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/amd_iommu_init.c

+2 −0
Original line number Diff line number Diff line
@@ -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

	}

}

include/asm-x86/gart.h

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ extern int fix_aperture; 
#else

#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)

{