diff --git a/[refs] b/[refs]
index 270848590ca7..0ac516f4b72c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 475f9aa6aa538befcbd0fa95bdebada600f247cd
+refs/heads/master: 4a6018f7f4f1075c1a5403b5ec0ee7262187b86c
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index ffbdfc86aedf..4c9e6bbf3772 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -1039,7 +1039,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma,
 		page = alloc_buddy_huge_page(h, vma, addr);
 		if (!page) {
 			hugetlb_put_quota(inode->i_mapping, chg);
-			return ERR_PTR(-VM_FAULT_OOM);
+			return ERR_PTR(-VM_FAULT_SIGBUS);
 		}
 	}