thp-setup-huge-zero-page-on-non-write-page-fault-fix

Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 58e8004243a67bb27588d9749808ef5211020996..373119d7f0e1771afee9271e4f9d7e0f117db3e1 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -738,7 +738,7 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                        pgtable_t pgtable;
                        pgtable = pte_alloc_one(mm, haddr);
                        if (unlikely(!pgtable))
-                               goto out;
+                               return VM_FAULT_OOM;
                        spin_lock(&mm->page_table_lock);
                        set_huge_zero_page(pgtable, mm, vma, haddr, pmd);
                        spin_unlock(&mm->page_table_lock);