---

yaml --- r: 344785 b: refs/heads/master c: 1ba6e0b h: refs/heads/master i: 344783: 409cb0f v: v3
git-mirror · Dec 11, 2012 · c40af3a · c40af3a
1 parent 5370a98
commit c40af3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b9d705297b273657923518dbea2377cd03532ed
+refs/heads/master: 1ba6e0b50b479cbadb8f05ebde3020da9ac87201
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -1364,6 +1364,8 @@ static int __split_huge_page_map(struct page *page,
 				BUG_ON(page_mapcount(page) != 1);
 			if (!pmd_young(*pmd))
 				entry = pte_mkold(entry);
+			if (pmd_numa(*pmd))
+				entry = pte_mknuma(entry);
 			pte = pte_offset_map(&_pmd, haddr);
 			BUG_ON(!pte_none(*pte));
 			set_pte_at(mm, haddr, pte, entry);