Now, alloc_huge_page() only return -ENOSPEC if failed. So, we don't need to worry about other return value. Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d960f46..0f56bbf 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2621,7 +2621,6 @@ retry_avoidcopy: new_page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(new_page)) { - long err = PTR_ERR(new_page); page_cache_release(old_page); /* @@ -2650,10 +2649,7 @@ retry_avoidcopy: /* Caller expects lock to be held */ spin_lock(ptl); - if (err == -ENOMEM) - return VM_FAULT_OOM; - else - return VM_FAULT_SIGBUS; + return VM_FAULT_SIGBUS; } /* @@ -2785,11 +2781,7 @@ retry: page = alloc_huge_page(vma, address, use_reserve); if (IS_ERR(page)) { - ret = PTR_ERR(page); - if (ret == -ENOMEM) - ret = VM_FAULT_OOM; - else - ret = VM_FAULT_SIGBUS; + ret = VM_FAULT_SIGBUS; goto out; } clear_huge_page(page, address, pages_per_huge_page(h)); -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>