From b87d1276adc45d0b333d2a6fe30641973e4e3978 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 8 Oct 2012 16:33:01 -0700
Subject: [PATCH] --- yaml --- r: 332447 b: refs/heads/master c:
 eab1eef9911c36966b5d5934e6970581b3316013 h: refs/heads/master i:   332445:
 26cc758320ed5de26edcd7b5e65bcba40c3872e2   332443:
 3929fc1cc07fd6b4af63798ea52deaf4fbcbe9d2   332439:
 26252014fe5af52d69ae73b1cb0a17355e7b8285   332431:
 53d2244eac1e650970638b41906a63f5e4b08037   332415:
 b8a675aa1d30f2a6df6e3297bfa2e7d87ac2271b v: v3

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

diff --git a/[refs] b/[refs]
index 3e59fd065a5c..3b1f3e71e4f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d28a2275c21d04290cfba1555c89a806d2b7706
+refs/heads/master: eab1eef9911c36966b5d5934e6970581b3316013
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index 7153e0d18670..0e7740923fb9 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -889,7 +889,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		entry = pmd_mkyoung(orig_pmd);
 		entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);
 		if (pmdp_set_access_flags(vma, haddr, pmd, entry,  1))
-			update_mmu_cache(vma, address, entry);
+			update_mmu_cache(vma, address, pmd);
 		ret |= VM_FAULT_WRITE;
 		goto out_unlock;
 	}
@@ -941,7 +941,7 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		pmdp_clear_flush_notify(vma, haddr, pmd);
 		page_add_new_anon_rmap(new_page, vma, haddr);
 		set_pmd_at(mm, haddr, pmd, entry);
-		update_mmu_cache(vma, address, entry);
+		update_mmu_cache(vma, address, pmd);
 		page_remove_rmap(page);
 		put_page(page);
 		ret |= VM_FAULT_WRITE;
@@ -2002,7 +2002,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, _pmd);
+	update_mmu_cache(vma, address, pmd);
 	pgtable_trans_huge_deposit(mm, pgtable);
 	spin_unlock(&mm->page_table_lock);