lkml.org 
[lkml]   [2008]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/8] intel-iommu: move iommu_prepare_gfx_mapping() out of dma_remapping.h
    Date
    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    drivers/pci/intel-iommu.c | 5 +++++
    include/linux/dma_remapping.h | 7 -------
    2 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
    index 080a860..aec60ad 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)
    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
    diff --git a/include/linux/dma_remapping.h b/include/linux/dma_remapping.h
    index 4ef5f6b..7799a85 100644
    --- a/include/linux/dma_remapping.h
    +++ b/include/linux/dma_remapping.h
    @@ -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
    --
    1.5.4.3


    \
     
     \ /
      Last update: 2008-11-20 16:55    [W:0.021 / U:30.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site