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

    Unify and demacro pud_page_vaddr.

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

    diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
    --- a/arch/x86/include/asm/pgtable-3level.h
    +++ b/arch/x86/include/asm/pgtable-3level.h
    @@ -117,9 +117,6 @@

    #define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)

    -#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK))
    -
    -
    /* Find an entry in the second-level page table.. */
    #define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) + \
    pmd_index(address))
    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
    @@ -500,6 +500,11 @@
    {
    return pud_val(pud) & _PAGE_PRESENT;
    }
    +
    +static inline unsigned long pud_page_vaddr(pud_t pud)
    +{
    + return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);
    +}
    #endif /* PAGETABLE_LEVELS > 2 */

    #if PAGETABLE_LEVELS > 3
    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
    @@ -184,8 +184,6 @@

    /* PUD - Level3 access */
    /* to find an entry in a page-table-directory. */
    -#define pud_page_vaddr(pud) \
    - ((unsigned long)__va(pud_val((pud)) & PHYSICAL_PAGE_MASK))
    #define pud_page(pud) (pfn_to_page(pud_val((pud)) >> PAGE_SHIFT))
    #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))
    #define pud_offset(pgd, address) \



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