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>
This commit is contained in:
parent
24d2ba0a8a
commit
92af4e2902
3 changed files with 7 additions and 2 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue