lkml.org 
[lkml]   [2009]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 33 of 36] x86: unify io_remap_pfn_range
    Date
    From
    Impact: cleanup

    Unify io_remap_pfn_range. Don't demacro yet.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/pgtable.h | 3 +++
    arch/x86/include/asm/pgtable_32.h | 3 ---
    arch/x86/include/asm/pgtable_64.h | 3 ---
    3 files changed, 3 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
    --- a/arch/x86/include/asm/pgtable.h
    +++ b/arch/x86/include/asm/pgtable.h
    @@ -562,6 +562,9 @@
    return npg >> (20 - PAGE_SHIFT);
    }

    +#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
    + remap_pfn_range(vma, vaddr, pfn, size, prot)
    +
    #if PAGETABLE_LEVELS > 2
    static inline int pud_none(pud_t pud)
    {
    diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
    --- a/arch/x86/include/asm/pgtable_32.h
    +++ b/arch/x86/include/asm/pgtable_32.h
    @@ -133,7 +133,4 @@
    #define kern_addr_valid(kaddr) (0)
    #endif

    -#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
    - remap_pfn_range(vma, vaddr, pfn, size, prot)
    -
    #endif /* _ASM_X86_PGTABLE_32_H */
    diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
    --- a/arch/x86/include/asm/pgtable_64.h
    +++ b/arch/x86/include/asm/pgtable_64.h
    @@ -204,9 +204,6 @@
    extern int kern_addr_valid(unsigned long addr);
    extern void cleanup_highmap(void);

    -#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
    - remap_pfn_range(vma, vaddr, pfn, size, prot)
    -
    #define HAVE_ARCH_UNMAPPED_AREA
    #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN




    \
     
     \ /
      Last update: 2009-02-05 20:45    [W:0.024 / U:33.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site