mm, hugetlb, soft_offline: use new_page_nodemask for soft offline migration

[mirror_ubuntu-artful-kernel.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index e2e0cb0e1d0f0c74fdec33d42599b2ad4cbb08d0..1cd3b3569af8a79285b75bfdb2485b7de7a69aa8 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1484,16 +1484,8 @@ EXPORT_SYMBOL(unpoison_memory);
 static struct page *new_page(struct page *p, unsigned long private, int **x)
 {
        int nid = page_to_nid(p);
-       if (PageHuge(p)) {
-               struct hstate *hstate = page_hstate(compound_head(p));
 
-               if (hstate_is_gigantic(hstate))
-                       return alloc_huge_page_node(hstate, NUMA_NO_NODE);
-
-               return alloc_huge_page_node(hstate, nid);
-       } else {
-               return __alloc_pages_node(nid, GFP_HIGHUSER_MOVABLE, 0);
-       }
+       return new_page_nodemask(p, nid, &node_states[N_MEMORY]);
 }
 
 /*