[PATCH 01/97] mm: thp: cleanup: mv alloc_hugepage to better place
From: Mel Gorman <mgorman@suse.de>
Date: 2014-08-28 18:36:09
Also in:
lkml
Subsystem:
memory management, memory management - thp (transparent huge page), the rest · Maintainers:
Andrew Morton, David Hildenbrand, Lorenzo Stoakes, Linus Torvalds
From: Bob Liu <redacted> commit 10dc4155c7714f508fe2e4667164925ea971fb25 upstream. Move alloc_hugepage() to a better place, no need for a seperate #ifndef CONFIG_NUMA Signed-off-by: Bob Liu <redacted> Reviewed-by: Yasuaki Ishimatsu <redacted> Acked-by: Kirill A. Shutemov <redacted> Cc: Andrea Arcangeli <redacted> Cc: Mel Gorman <redacted> Cc: Andrew Davidoff <redacted> Cc: Wanpeng Li <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Mel Gorman <mgorman@suse.de> --- mm/huge_memory.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 389973f..738a57e 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c@@ -758,14 +758,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)
@@ -2249,6 +2241,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;
--
1.8.4.5