---

yaml --- r: 272167 b: refs/heads/master c: 35d8c7a h: refs/heads/master i: 272165: b4ec693 272163: 8323fc3 272159: 0cc1f87 v: v3
git-mirror · Nov 1, 2011 · 076aa0a · 076aa0a
1 parent e80e2a7
commit 076aa0a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0089e4853ae1ac161fae5137170971ccb6f4f152
+refs/heads/master: 35d8c7ad7208dad5d352c483408e555022750978
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -1952,7 +1952,7 @@ static void collapse_huge_page(struct mm_struct *mm,
 	BUG_ON(!pmd_none(*pmd));
 	page_add_new_anon_rmap(new_page, vma, address);
 	set_pmd_at(mm, address, pmd, _pmd);
-	update_mmu_cache(vma, address, entry);
+	update_mmu_cache(vma, address, _pmd);
 	prepare_pmd_huge_pte(pgtable, mm);
 	mm->nr_ptes--;
 	spin_unlock(&mm->page_table_lock);