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

    Unify and demacro pud_large.

    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    ---
    arch/x86/include/asm/pgtable.h | 6 ++++++
    arch/x86/include/asm/pgtable_32.h | 2 --
    arch/x86/include/asm/pgtable_64.h | 6 ------
    3 files changed, 6 insertions(+), 8 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
    @@ -578,6 +578,12 @@
    {
    return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;
    }
    +
    +static inline int pud_large(pud_t pud)
    +{
    + return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
    + (_PAGE_PSE | _PAGE_PRESENT);
    +}
    #endif /* PAGETABLE_LEVELS > 2 */

    #if PAGETABLE_LEVELS > 3
    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
    @@ -95,8 +95,6 @@
    # include <asm/pgtable-2level.h>
    #endif

    -static inline int pud_large(pud_t pud) { return 0; }
    -
    #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
    @@ -183,12 +183,6 @@

    /* PUD - Level3 access */

    -static inline int pud_large(pud_t pte)
    -{
    - return (pud_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==
    - (_PAGE_PSE | _PAGE_PRESENT);
    -}
    -
    /* PMD - Level 2 access */
    #define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT)
    #define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) | \



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