diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-09 12:42:57 -0600 |
| commit | e4c8308c852e6b3fa49215052a5b9e99597dee99 (patch) | |
| tree | a44ef3377c17d69c2210e809ac2552540ce6f1fc /mm | |
| parent | c37f3c2749b53225d36faa5c583203c5f12ae15b (diff) | |
| parent | 626a96db11698119a67eeda130488e869aa6f14e (diff) | |
Merge branch 'ep93xx-dma' into spi/next
Diffstat (limited to 'mm')
| -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 f33bb319b73..6402458fee3 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); |