---

yaml --- r: 283000 b: refs/heads/master c: ef009b2 h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · b5434d9 · b5434d9
1 parent 0e3c73d
commit b5434d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a734bcc812146cfba530e1adaf609fce1357982e
+refs/heads/master: ef009b25f4f8a77d2b32067d424d5ac757dcdc5b
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -2349,6 +2349,9 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
 
 /*
  * Hugetlb_cow() should be called with page lock of the original hugepage held.
+ * Called with hugetlb_instantiation_mutex held and pte_page locked so we
+ * cannot race with other handlers or page migration.
+ * Keep the pte_same checks anyway to make transition from the mutex easier.
  */
 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
 			unsigned long address, pte_t *ptep, pte_t pte,