---

yaml --- r: 253121 b: refs/heads/master c: e0dcd8a h: refs/heads/master i: 253119: 7234cf9 v: v3
git-mirror · Jun 6, 2011 · d009134 · d009134
1 parent ba210a5
commit d009134
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d6925d43bd637fe4da7acb7bf1d0b92d38ab34b
+refs/heads/master: e0dcd8a05be438b3d2e49ef61441ea3a463663f8
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
@@ -1033,10 +1033,10 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
 	 */
 	chg = vma_needs_reservation(h, vma, addr);
 	if (chg < 0)
-		return ERR_PTR(chg);
+		return ERR_PTR(-VM_FAULT_OOM);
 	if (chg)
 		if (hugetlb_get_quota(inode->i_mapping, chg))
-			return ERR_PTR(-ENOSPC);
+			return ERR_PTR(-VM_FAULT_SIGBUS);
 
 	spin_lock(&hugetlb_lock);
 	page = dequeue_huge_page_vma(h, vma, addr, avoid_reserve);