---

yaml --- r: 282999 b: refs/heads/master c: a734bcc h: refs/heads/master i: 282997: 528e9f6 282995: 2ea35dd 282991: 63956d6 v: v3
git-mirror · Jan 11, 2012 · 0e3c73d · 0e3c73d
1 parent d735b9e
commit 0e3c73d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f8aefd44e64ed2f6950a1dcc77309b7dd9979f4
+refs/heads/master: a734bcc812146cfba530e1adaf609fce1357982e
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2408,7 +2408,14 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
 				BUG_ON(page_count(old_page) != 1);
 				BUG_ON(huge_pte_none(pte));
 				spin_lock(&mm->page_table_lock);
-				goto retry_avoidcopy;
+				ptep = huge_pte_offset(mm, address & huge_page_mask(h));
+				if (likely(pte_same(huge_ptep_get(ptep), pte)))
+					goto retry_avoidcopy;
+				/*
+				 * race occurs while re-acquiring page_table_lock, and
+				 * our job is done.
+				 */
+				return 0;
 			}
 			WARN_ON_ONCE(1);
 		}