aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2008-11-20 10:49:50 -0500
committerJoerg Roedel <joerg.roedel@amd.com>2009-01-03 05:57:35 -0500
commit2abd7e167c1b281f99bb58d302225872bfae9123 (patch)
treef4583028e1f80d31b983004ef82269fe50358c7f /drivers
parent58fa7304a2c2bfd46e505c293ef779aa1d9715c2 (diff)
intel-iommu: move iommu_prepare_gfx_mapping() out of dma_remapping.h
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/intel-iommu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index f23a02054bf..c1c59a61965 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1686,6 +1686,11 @@ static void __init iommu_prepare_gfx_mapping(void)
1686 printk(KERN_ERR "IOMMU: mapping reserved region failed\n"); 1686 printk(KERN_ERR "IOMMU: mapping reserved region failed\n");
1687 } 1687 }
1688} 1688}
1689#else /* !CONFIG_DMAR_GFX_WA */
1690static inline void iommu_prepare_gfx_mapping(void)
1691{
1692 return;
1693}
1689#endif 1694#endif
1690 1695
1691#ifdef CONFIG_DMAR_FLOPPY_WA 1696#ifdef CONFIG_DMAR_FLOPPY_WA