lkml.org 
[lkml]   [2008]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] x86: remove ifdef CONFIG_CALGARY_IOMMU in pci-dma.c
    Date
    asm-x86/calgary.h has dummy calgary_iommu_init() and detect_calgary()
    in !CONFIG_CALGARY_IOMMU case. So we don't need ifdef
    CONFIG_CALGARY_IOMMU in pci-dma.c.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: Alexis Bruemmer <alexisb@us.ibm.com>
    ---
    arch/x86/kernel/pci-dma.c | 4 ----
    1 files changed, 0 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
    index 034fe1c..2377de7 100644
    --- a/arch/x86/kernel/pci-dma.c
    +++ b/arch/x86/kernel/pci-dma.c
    @@ -116,9 +116,7 @@ void __init pci_iommu_alloc(void)
    */
    gart_iommu_hole_init();

    -#ifdef CONFIG_CALGARY_IOMMU
    detect_calgary();
    -#endif

    detect_intel_iommu();

    @@ -378,9 +376,7 @@ EXPORT_SYMBOL(dma_free_coherent);

    static int __init pci_iommu_init(void)
    {
    -#ifdef CONFIG_CALGARY_IOMMU
    calgary_iommu_init();
    -#endif

    intel_iommu_init();

    --
    1.5.5.GIT


    \
     
     \ /
      Last update: 2008-07-11 03:49    [W:0.023 / U:0.312 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site