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

    Unify and demacro pmd_pfn.

    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
    @@ -548,6 +548,11 @@
    {
    return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address);
    }
    +
    +static inline unsigned long pmd_pfn(pmd_t pmd)
    +{
    + return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
    +}
    #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
    @@ -190,8 +190,6 @@
    }

    /* PMD - Level 2 access */
    -#define pmd_pfn(x) ((pmd_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT)
    -
    #define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT)
    #define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) | \
    _PAGE_FILE })



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