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

    Unify and demacro pte_none.

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

    diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
    --- a/arch/x86/include/asm/pgtable-2level.h
    +++ b/arch/x86/include/asm/pgtable-2level.h
    @@ -53,8 +53,6 @@
    #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp)
    #endif

    -#define pte_none(x) (!(x).pte_low)
    -
    /*
    * Bits _PAGE_BIT_PRESENT, _PAGE_BIT_FILE and _PAGE_BIT_PROTNONE are taken,
    * split up the 29 bits of offset into this range:
    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
    @@ -151,11 +151,6 @@
    return a.pte_low == b.pte_low && a.pte_high == b.pte_high;
    }

    -static inline int pte_none(pte_t pte)
    -{
    - return !pte.pte_low && !pte.pte_high;
    -}
    -
    /*
    * Bits 0, 6 and 7 are taken in the low part of the pte,
    * put the 32 bits of offset into the high part.
    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
    @@ -457,6 +457,11 @@
    }
    #endif /* CONFIG_PARAVIRT */

    +static inline int pte_none(pte_t pte)
    +{
    + return !pte.pte;
    +}
    +
    #endif /* __ASSEMBLY__ */

    #ifdef CONFIG_X86_32
    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
    @@ -170,7 +170,6 @@
    return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE;
    }

    -#define pte_none(x) (!pte_val((x)))
    #define pte_present(x) (pte_val((x)) & (_PAGE_PRESENT | _PAGE_PROTNONE))

    #ifdef CONFIG_KMEMCHECK



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