Subject: [merged] mm-thp-cleanup-mv-alloc_hugepage-to-better-place.patch removed from -mm tree
To: lliubbo@xxxxxxxxx,aarcange@xxxxxxxxxx,bob.liu@xxxxxxxxxx,davidoff@xxxxxxxxx,isimatu.yasuaki@xxxxxxxxxxxxxx,kirill.shutemov@xxxxxxxxxxxxxxx,liwanp@xxxxxxxxxxxxxxxxxx,mel@xxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 13 Nov 2013 12:38:24 -0800
The patch titled
Subject: mm: thp: cleanup: mv alloc_hugepage to better place
has been removed from the -mm tree. Its filename was
mm-thp-cleanup-mv-alloc_hugepage-to-better-place.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Bob Liu <lliubbo@xxxxxxxxx>
Subject: 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: Bob Liu <bob.liu@xxxxxxxxxx>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>
Acked-by: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Andrew Davidoff <davidoff@xxxxxxxxx>
Cc: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/huge_memory.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff -puN mm/huge_memory.c~mm-thp-cleanup-mv-alloc_hugepage-to-better-place mm/huge_memory.c
--- a/mm/huge_memory.c~mm-thp-cleanup-mv-alloc_hugepage-to-better-place
+++ a/mm/huge_memory.c
@@ -759,14 +759,6 @@ static inline struct page *alloc_hugepag
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;
_
Patches currently in -mm which might be from lliubbo@xxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
