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

    Unify and demacro pte_offset_kernel.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/pgtable.h | 5 +++++
    arch/x86/include/asm/pgtable_32.h | 3 ---
    arch/x86/include/asm/pgtable_64.h | 3 ---
    3 files changed, 5 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
    @@ -547,6 +547,11 @@
    return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
    }

    +static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
    +{
    + return (pte_t *)pmd_page_vaddr(*pmd) + pte_index(address);
    +}
    +
    #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
    @@ -97,9 +97,6 @@

    static inline int pud_large(pud_t pud) { return 0; }

    -#define pte_offset_kernel(dir, address) \
    - ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index((address)))
    -
    #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
    @@ -197,9 +197,6 @@

    /* PTE - Level 1 access. */

    -#define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \
    - pte_index((address)))
    -
    /* x86-64 always has all page tables mapped. */
    #define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))
    #define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address))



    \
     
     \ /
      Last update: 2009-02-05 20:41    [W:3.046 / U:0.592 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site