From: Andrew Morton Cc: Mel Gorman Signed-off-by: Andrew Morton --- include/linux/hugetlb.h | 1 - mm/hugetlb.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff -puN mm/hugetlb.c~allow-huge-page-allocations-to-use-gfp_high_movable-fix mm/hugetlb.c --- a/mm/hugetlb.c~allow-huge-page-allocations-to-use-gfp_high_movable-fix +++ a/mm/hugetlb.c @@ -27,7 +27,7 @@ unsigned long max_huge_pages; static struct list_head hugepage_freelists[MAX_NUMNODES]; static unsigned int nr_huge_pages_node[MAX_NUMNODES]; static unsigned int free_huge_pages_node[MAX_NUMNODES]; -gfp_t htlb_alloc_mask = GFP_HIGHUSER; +static gfp_t htlb_alloc_mask = GFP_HIGHUSER; unsigned long hugepages_treat_as_movable; /* diff -puN include/linux/hugetlb.h~allow-huge-page-allocations-to-use-gfp_high_movable-fix include/linux/hugetlb.h --- a/include/linux/hugetlb.h~allow-huge-page-allocations-to-use-gfp_high_movable-fix +++ a/include/linux/hugetlb.h @@ -31,7 +31,6 @@ void hugetlb_unreserve_pages(struct inod extern unsigned long max_huge_pages; extern unsigned long hugepages_treat_as_movable; -extern gfp_t htlb_alloc_mask; extern const unsigned long hugetlb_zero, hugetlb_infinity; extern int sysctl_hugetlb_shm_group; _