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 10 of 36] x86: unify pgd_page_vaddr
    Date
    From
    Impact: cleanup

    Unify and demacro pgd_page_vaddr.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/pgtable.h | 5 +++++
    arch/x86/include/asm/pgtable_64.h | 2 --
    2 files changed, 5 insertions(+), 2 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
    @@ -507,6 +507,11 @@
    {
    return pgd_val(pgd) & _PAGE_PRESENT;
    }
    +
    +static inline unsigned long pgd_page_vaddr(pgd_t pgd)
    +{
    + return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);
    +}
    #endif /* PAGETABLE_LEVELS > 3 */

    #endif /* __ASSEMBLY__ */
    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
    @@ -178,8 +178,6 @@
    /*
    * Level 4 access.
    */
    -#define pgd_page_vaddr(pgd) \
    - ((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK))
    #define pgd_page(pgd) (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT))
    static inline int pgd_large(pgd_t pgd) { return 0; }
    #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE)



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