lkml.org 
[lkml]   [2017]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 5/9] mm/hugetlb: Move default definition of hugepd_t earlier in the header
    Date
    This enable to use the hugepd_t type early. No functional change in this patch.

    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    ---
    include/linux/hugetlb.h | 47 ++++++++++++++++++++++++-----------------------
    1 file changed, 24 insertions(+), 23 deletions(-)

    diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
    index edab98f0a7b8..f66c1d4e0d1f 100644
    --- a/include/linux/hugetlb.h
    +++ b/include/linux/hugetlb.h
    @@ -14,6 +14,30 @@ struct ctl_table;
    struct user_struct;
    struct mmu_gather;

    +#ifndef is_hugepd
    +/*
    + * Some architectures requires a hugepage directory format that is
    + * required to support multiple hugepage sizes. For example
    + * a4fe3ce76 "powerpc/mm: Allow more flexible layouts for hugepage pagetables"
    + * introduced the same on powerpc. This allows for a more flexible hugepage
    + * pagetable layout.
    + */
    +typedef struct { unsigned long pd; } hugepd_t;
    +#define is_hugepd(hugepd) (0)
    +#define __hugepd(x) ((hugepd_t) { (x) })
    +static inline int gup_huge_pd(hugepd_t hugepd, unsigned long addr,
    + unsigned pdshift, unsigned long end,
    + int write, struct page **pages, int *nr)
    +{
    + return 0;
    +}
    +#else
    +extern int gup_huge_pd(hugepd_t hugepd, unsigned long addr,
    + unsigned pdshift, unsigned long end,
    + int write, struct page **pages, int *nr);
    +#endif
    +
    +
    #ifdef CONFIG_HUGETLB_PAGE

    #include <linux/mempolicy.h>
    @@ -222,29 +246,6 @@ static inline int pud_write(pud_t pud)
    }
    #endif

    -#ifndef is_hugepd
    -/*
    - * Some architectures requires a hugepage directory format that is
    - * required to support multiple hugepage sizes. For example
    - * a4fe3ce76 "powerpc/mm: Allow more flexible layouts for hugepage pagetables"
    - * introduced the same on powerpc. This allows for a more flexible hugepage
    - * pagetable layout.
    - */
    -typedef struct { unsigned long pd; } hugepd_t;
    -#define is_hugepd(hugepd) (0)
    -#define __hugepd(x) ((hugepd_t) { (x) })
    -static inline int gup_huge_pd(hugepd_t hugepd, unsigned long addr,
    - unsigned pdshift, unsigned long end,
    - int write, struct page **pages, int *nr)
    -{
    - return 0;
    -}
    -#else
    -extern int gup_huge_pd(hugepd_t hugepd, unsigned long addr,
    - unsigned pdshift, unsigned long end,
    - int write, struct page **pages, int *nr);
    -#endif
    -
    #define HUGETLB_ANON_FILE "anon_hugepage"

    enum {
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-05-16 11:25    [W:2.729 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site