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

Commit 10dc4155 authored by Bob Liu's avatar Bob Liu Committed by Linus Torvalds
Browse files

mm: thp: cleanup: mv alloc_hugepage to better place 



Move alloc_hugepage() to a better place, no need for a seperate #ifndef
CONFIG_NUMA

Signed-off-by: default avatarBob Liu <bob.liu@oracle.com>
Reviewed-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andrew Davidoff <davidoff@qedmf.net>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0151e3d6

mm/huge_memory.c

+6 −8
Original line number Diff line number Diff line
@@ -759,14 +759,6 @@ static inline struct page *alloc_hugepage_vma(int defrag, 
			       HPAGE_PMD_ORDER, vma, haddr, nd);

}



#ifndef CONFIG_NUMA

static inline struct page *alloc_hugepage(int defrag)

{

	return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),

			   HPAGE_PMD_ORDER);

}

#endif



static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

		struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,

		struct page *zero_page)
@@ -2251,6 +2243,12 @@ static struct page 
	return *hpage;

}

#else

static inline struct page *alloc_hugepage(int defrag)

{

	return alloc_pages(alloc_hugepage_gfpmask(defrag, 0),

			   HPAGE_PMD_ORDER);

}



static struct page *khugepaged_alloc_hugepage(bool *wait)

{

	struct page *hpage;