lkml.org 
[lkml]   [2019]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v9 5/8] arm64: Move hugetlb related definitions out of pgtable.h to page-defs.h
    From
    Date
    From: Alexander Duyck <alexander.h.duyck@linux.intel.com>

    Move the static definition for things such as HUGETLB_PAGE_ORDER out of
    asm/pgtable.h and place it in page-defs.h. By doing this the includes
    become much easier to deal with as currently arm64 is the only architecture
    that didn't include this definition in the asm/page.h file or a file
    included by it.

    It also makes logical sense as PAGE_SHIFT was already defined in
    page-defs.h so now we also have HPAGE_SHIFT defined there as well.

    Signed-off-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
    ---
    arch/arm64/include/asm/page-def.h | 9 +++++++++
    arch/arm64/include/asm/pgtable.h | 9 ---------
    2 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/arch/arm64/include/asm/page-def.h b/arch/arm64/include/asm/page-def.h
    index f99d48ecbeef..1c5b079e2482 100644
    --- a/arch/arm64/include/asm/page-def.h
    +++ b/arch/arm64/include/asm/page-def.h
    @@ -20,4 +20,13 @@
    #define CONT_SIZE (_AC(1, UL) << (CONT_SHIFT + PAGE_SHIFT))
    #define CONT_MASK (~(CONT_SIZE-1))

    +/*
    + * Hugetlb definitions.
    + */
    +#define HUGE_MAX_HSTATE 4
    +#define HPAGE_SHIFT PMD_SHIFT
    +#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
    +#define HPAGE_MASK (~(HPAGE_SIZE - 1))
    +#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
    +
    #endif /* __ASM_PAGE_DEF_H */
    diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
    index 7576df00eb50..06a376de9bd6 100644
    --- a/arch/arm64/include/asm/pgtable.h
    +++ b/arch/arm64/include/asm/pgtable.h
    @@ -305,15 +305,6 @@ static inline int pte_same(pte_t pte_a, pte_t pte_b)
    */
    #define pte_mkhuge(pte) (__pte(pte_val(pte) & ~PTE_TABLE_BIT))

    -/*
    - * Hugetlb definitions.
    - */
    -#define HUGE_MAX_HSTATE 4
    -#define HPAGE_SHIFT PMD_SHIFT
    -#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
    -#define HPAGE_MASK (~(HPAGE_SIZE - 1))
    -#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
    -
    static inline pte_t pgd_pte(pgd_t pgd)
    {
    return __pte(pgd_val(pgd));
    \
     
     \ /
      Last update: 2019-09-07 19:26    [W:3.519 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site