renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-20 19:43:58 +08:00
Code

x86, AMD IOMMU, build fix #2

Browse Source 
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>
This commit is contained in:
Ingo Molnar 2008-06-27 10:48:16 +02:00
parent 24d2ba0a8a
commit 92af4e2902
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/amd_iommu.c
View File

@ -937,8 +937,10 @@ int __init amd_iommu_init_dma_ops(void)
iommu_detected = 1; iommu_detected = 1;
force_iommu = 1; force_iommu = 1;
bad_dma_address = 0; bad_dma_address = 0;
#ifdef CONFIG_GART_IOMMU
gart_iommu_aperture_disabled = 1; gart_iommu_aperture_disabled = 1;
gart_iommu_aperture = 0; gart_iommu_aperture = 0;
#endif
dma_ops = &amd_iommu_dma_ops; dma_ops = &amd_iommu_dma_ops;

2
arch/x86/kernel/amd_iommu_init.c
View File

@ -801,8 +801,10 @@ void __init amd_iommu_detect(void)
if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) { if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
iommu_detected = 1; iommu_detected = 1;
#ifdef CONFIG_GART_IOMMU
gart_iommu_aperture_disabled = 1; gart_iommu_aperture_disabled = 1;
gart_iommu_aperture = 0; gart_iommu_aperture = 0;
#endif
} }
} }

5
include/asm-x86/gart.h
View File

@ -18,8 +18,9 @@ extern int gart_iommu_aperture_allowed;
extern int gart_iommu_aperture_disabled; extern int gart_iommu_aperture_disabled;
extern int fix_aperture; extern int fix_aperture;
#else #else
#define gart_iommu_aperture 0 #define gart_iommu_aperture 0
#define gart_iommu_aperture_allowed 0 #define gart_iommu_aperture_allowed 0
#define gart_iommu_aperture_disabled 1
static inline void early_gart_iommu_check(void) static inline void early_gart_iommu_check(void)
{ {