From 076aa0ad011a9b56caa9d2a9f336202370ca25ac Mon Sep 17 00:00:00 2001
From: Hillf Danton <dhillf@gmail.com>
Date: Mon, 31 Oct 2011 17:09:40 -0700
Subject: [PATCH] --- yaml --- r: 272167 b: refs/heads/master c:
 35d8c7ad7208dad5d352c483408e555022750978 h: refs/heads/master i:   272165:
 b4ec69321666d1be2e9b9455f234da633e04750d   272163:
 8323fc3e938268b8f5024633f0d09f5d2ec0be72   272159:
 0cc1f8764815bf24572a53dafb3275883f04c9de v: v3

---
 [refs]                 | 2 +-
 trunk/mm/huge_memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d3f27ce02a5..27f90a0c4f05 100644
--- 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
index ef954384f53a..860ec211ddd6 100644
--- 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);