Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2299292 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm/hugetlb: move default definition of hugepd_t earlier in the header 

This enable to use the hugepd_t type early.  No functional change in
this patch.

Link: http://lkml.kernel.org/r/1494926612-23928-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mike Kravetz <kravetz@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent faaa5b62

include/linux/hugetlb.h

+24 −23
Original line number Diff line number Diff line
@@ -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 {