diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 13:12:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 13:12:02 -0400 |
| commit | 93ea927eb15b736fa4a431f789b1097318129d2a (patch) | |
| tree | b141a0e06c9d1616dc7f0c616a96655afd32f8b0 /mm/hugetlb.c | |
| parent | dbcb4a1a3f16702918caa4d4ab7062965050a780 (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index f33bb319b73f..6402458fee38 100644 --- a/mm/hugetlb.c +++ b/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); |