---

yaml --- r: 343303 b: refs/heads/master c: cad7f61 h: refs/heads/master i: 343301: df64455 343299: 3c1cb77 343295: 2603108 v: v3
git-mirror · Dec 13, 2012 · 8db2eb2 · 8db2eb2
1 parent 1e28e33
commit 8db2eb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;