lkml.org 
[lkml]   [2009]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] x86: move iommu_shutdown_noop to x86_init.c
    Date
    iommu_init_noop() is in arch/x86/kernel/x86_init.c but
    iommu_shutdown_noop() in arch/x86/include/asm/iommu.h.

    This moves iommu_shutdown_noop() to x86_init.c for consistency.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    ---
    arch/x86/include/asm/iommu.h | 1 -
    arch/x86/kernel/x86_init.c | 1 +
    2 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
    index df42a71..345c99c 100644
    --- a/arch/x86/include/asm/iommu.h
    +++ b/arch/x86/include/asm/iommu.h
    @@ -1,7 +1,6 @@
    #ifndef _ASM_X86_IOMMU_H
    #define _ASM_X86_IOMMU_H

    -static inline void iommu_shutdown_noop(void) {}
    extern struct dma_map_ops nommu_dma_ops;
    extern int force_iommu, no_iommu;
    extern int iommu_detected;
    diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
    index c46984d..80f3ae2 100644
    --- a/arch/x86/kernel/x86_init.c
    +++ b/arch/x86/kernel/x86_init.c
    @@ -20,6 +20,7 @@ void __cpuinit x86_init_noop(void) { }
    void __init x86_init_uint_noop(unsigned int unused) { }
    void __init x86_init_pgd_noop(pgd_t *unused) { }
    int __init iommu_init_noop(void) { return 0; }
    +void __init iommu_shutdown_noop(void) { }

    /*
    * The platform setup functions are preset with the default functions
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-11-14 12:51    [W:0.021 / U:0.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site