---

yaml --- r: 344776 b: refs/heads/master c: 4fd0177 h: refs/heads/master v: v3
git-mirror · Dec 11, 2012 · 1255b19 · 1255b19
1 parent 468415e
commit 1255b19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d1acce4537c4e2f5889ed9ba9b8eddb80d99820
+refs/heads/master: 4fd017708c4a067da51a2b5cf8aedddf4e840b1f
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -710,7 +710,8 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * run pte_offset_map on the pmd, if an huge pmd could
 	 * materialize from under us from a different thread.
 	 */
-	if (unlikely(__pte_alloc(mm, vma, pmd, address)))
+	if (unlikely(pmd_none(*pmd)) &&
+	    unlikely(__pte_alloc(mm, vma, pmd, address)))
 		return VM_FAULT_OOM;
 	/* if an huge pmd materialized from under us just retry later */
 	if (unlikely(pmd_trans_huge(*pmd)))

diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -3560,7 +3560,8 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	 * run pte_offset_map on the pmd, if an huge pmd could
 	 * materialize from under us from a different thread.
 	 */
-	if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
+	if (unlikely(pmd_none(*pmd)) &&
+	    unlikely(__pte_alloc(mm, vma, pmd, address)))
 		return VM_FAULT_OOM;
 	/* if an huge pmd materialized from under us just retry later */
 	if (unlikely(pmd_trans_huge(*pmd)))