From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Date: Thu, 29 Nov 2012 03:17:38 +0000 (+1100)
Subject: thp-setup-huge-zero-page-on-non-write-page-fault-fix
X-Git-Tag: next-20121205~1^2~261
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f716fd8a067eb497754411dbca31e2d15ee042cc;p=karo-tx-linux.git

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 58e8004243a6..373119d7f0e1 100644
--- 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);