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

    Unify and demacro pmd_page.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/pgtable.h | 5 +++++
    arch/x86/include/asm/pgtable_32.h | 2 --
    arch/x86/include/asm/pgtable_64.h | 2 --
    3 files changed, 5 insertions(+), 4 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
    @@ -511,6 +511,11 @@
    return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);
    }

    +static inline struct page *pmd_page(pmd_t pmd)
    +{
    + return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT);
    +}
    +
    #if PAGETABLE_LEVELS > 2
    static inline int pud_present(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
    @@ -124,8 +124,6 @@
    #define pte_offset_kernel(dir, address) \
    ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index((address)))

    -#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))
    -
    #if defined(CONFIG_HIGHPTE)
    #define pte_offset_map(dir, address) \
    ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \
    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
    @@ -190,8 +190,6 @@
    }

    /* PMD - Level 2 access */
    -#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))
    -
    #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
    #define pmd_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \
    pmd_index(address))



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