From 513ce118d35de36023ed30245ba177298d21e38d Mon Sep 17 00:00:00 2001
From: Dean Nelson <dnelson@redhat.com>
Date: Tue, 26 Oct 2010 14:22:08 -0700
Subject: [PATCH] --- yaml --- r: 217493 b: refs/heads/master c:
 44e2aa937e698ea95dd86b2a4fabd734ef2c76db h: refs/heads/master i:   217491:
 a3ad6a8ffaeee76f196732549a5194bfb30cfbfe v: v3

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

diff --git a/[refs] b/[refs]
index 7b57ba5390b3..d4fcc98b12f2 100644
--- 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
index 96991ded82fe..c4a3558589ab 100644
--- 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);