---

yaml --- r: 376267 b: refs/heads/master c: 7c34251 h: refs/heads/master i: 376265: d932b69 376263: 2eef783 v: v3
git-mirror · May 24, 2013 · 7d5daa3 · 7d5daa3
1 parent b2009be
commit 7d5daa3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7450231fb35492951e78a91b833fd935171f4e66
+refs/heads/master: 7c3425123ddfdc5f48e7913ff59d908789712b18
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -2325,7 +2325,12 @@ static void collapse_huge_page(struct mm_struct *mm,
 		pte_unmap(pte);
 		spin_lock(&mm->page_table_lock);
 		BUG_ON(!pmd_none(*pmd));
-		set_pmd_at(mm, address, pmd, _pmd);
+		/*
+		 * We can only use set_pmd_at when establishing
+		 * hugepmds and never for establishing regular pmds that
+		 * points to regular pagetables. Use pmd_populate for that
+		 */
+		pmd_populate(mm, pmd, pmd_pgtable(_pmd));
 		spin_unlock(&mm->page_table_lock);
 		anon_vma_unlock_write(vma->anon_vma);
 		goto out;