Commit 2abd7e16 authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Joerg Roedel
Browse files

intel-iommu: move iommu_prepare_gfx_mapping() out of dma_remapping.h 



Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 58fa7304

drivers/pci/intel-iommu.c

+5 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,11 @@ static void __init iommu_prepare_gfx_mapping(void) 
			printk(KERN_ERR "IOMMU: mapping reserved region failed\n");

	}

}

#else /* !CONFIG_DMAR_GFX_WA */

static inline void iommu_prepare_gfx_mapping(void)

{

	return;

}

#endif



#ifdef CONFIG_DMAR_FLOPPY_WA

include/linux/dma_remapping.h

+0 −7
Original line number Diff line number Diff line
@@ -20,11 +20,4 @@ extern void free_dmar_iommu(struct intel_iommu *iommu); 


extern int dmar_disabled;



#ifndef CONFIG_DMAR_GFX_WA

static inline void iommu_prepare_gfx_mapping(void)

{

	return;

}

#endif /* !CONFIG_DMAR_GFX_WA */



#endif