From 8db2eb2448eb76f7c7902114d38374d8805040fc Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date: Wed, 12 Dec 2012 13:50:57 -0800
Subject: [PATCH] --- yaml --- r: 343303 b: refs/heads/master c:
 cad7f613c4d010e1d0f05c9a4fb33c7ae40ba115 h: refs/heads/master i:   343301:
 df64455b72fa3a7ff9f06b5e1bf370828d74dce0   343299:
 3c1cb776644ec050038b22c2b6c306277e6e5764   343295:
 2603108975e548b79c71223f479fed427229f189 v: v3

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

diff --git a/[refs] b/[refs]
index d78449529ea7..e7f5f102274d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b4796dede916de74b21fbd637588da6a99a7ec
+refs/heads/master: cad7f613c4d010e1d0f05c9a4fb33c7ae40ba115
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index a959b3a4ddd5..7742fb36eb4d 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -1273,6 +1273,7 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
 		pmd_t entry;
 		entry = pmdp_get_and_clear(mm, addr, pmd);
 		entry = pmd_modify(entry, newprot);
+		BUG_ON(pmd_write(entry));
 		set_pmd_at(mm, addr, pmd, entry);
 		spin_unlock(&vma->vm_mm->page_table_lock);
 		ret = 1;