---

yaml --- r: 217493 b: refs/heads/master c: 44e2aa9 h: refs/heads/master i: 217491: a3ad6a8 v: v3
git-mirror · Oct 26, 2010 · 513ce11 · 513ce11
1 parent 5e22080
commit 513ce11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70384dc6dcc6aa76762200262820bdb8b724ecd5
+refs/heads/master: 44e2aa937e698ea95dd86b2a4fabd734ef2c76db
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2448,8 +2448,11 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * When the original hugepage is shared one, it does not have
 	 * anon_vma prepared.
 	 */
-	if (unlikely(anon_vma_prepare(vma)))
+	if (unlikely(anon_vma_prepare(vma))) {
+		/* Caller expects lock to be held */
+		spin_lock(&mm->page_table_lock);
 		return VM_FAULT_OOM;
+	}
 
 	copy_user_huge_page(new_page, old_page, address, vma);
 	__SetPageUptodate(new_page);