diff options
author | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
commit | a1e66dd0515c8cfa72b8e2a3834d59548cf84ba5 (patch) | |
tree | e1e1edf210c8dde6edbdfa32ed6ff59ac553729b /mm/hugetlb.c | |
parent | d89d63a973986bf6c1d8b28ab62eb61491a3bb34 (diff) | |
parent | 6c62673cf58516e1b82329ac90ebf3ff3f485672 (diff) |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ffbdfc86aedf..4c9e6bbf3772 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -1039,7 +1039,7 @@ static struct page *alloc_huge_page(struct vm_area_struct *vma, | |||
1039 | page = alloc_buddy_huge_page(h, vma, addr); | 1039 | page = alloc_buddy_huge_page(h, vma, addr); |
1040 | if (!page) { | 1040 | if (!page) { |
1041 | hugetlb_put_quota(inode->i_mapping, chg); | 1041 | hugetlb_put_quota(inode->i_mapping, chg); |
1042 | return ERR_PTR(-VM_FAULT_OOM); | 1042 | return ERR_PTR(-VM_FAULT_SIGBUS); |
1043 | } | 1043 | } |
1044 | } | 1044 | } |
1045 | 1045 | ||