---

yaml --- r: 233924 b: refs/heads/master c: 19ee151 h: refs/heads/master v: v3
git-mirror · Mar 5, 2011 · 047980b · 047980b
1 parent 4b86eba
commit 047980b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 236344d6b417d05a3080477639234fd9ca97568d
+refs/heads/master: 19ee151e140daa5183c4984981801e542e0544fb
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -799,8 +799,8 @@ static int do_huge_pmd_wp_page_fallback(struct mm_struct *mm,
 	}
 
 	for (i = 0; i < HPAGE_PMD_NR; i++) {
-		pages[i] = alloc_page_vma(GFP_HIGHUSER_MOVABLE,
-					  vma, address);
+		pages[i] = alloc_page_vma_node(GFP_HIGHUSER_MOVABLE,
+					       vma, address, page_to_nid(page));
 		if (unlikely(!pages[i] ||
 			     mem_cgroup_newpage_charge(pages[i], mm,
 						       GFP_KERNEL))) {