Joonsoo Kim <iamjoonsoo....@lge.com> writes:
> Now, alloc_huge_page() only return -ENOSPEC if failed.
> So, we don't worry about other return value.
>
> Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index bc666cf..24de2ca 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -2544,7 +2544,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);
>
> /*
> @@ -2573,10 +2572,7 @@ retry_avoidcopy:
>
> /* Caller expects lock to be held */
> spin_lock(&mm->page_table_lock);
> - if (err == -ENOMEM)
> - return VM_FAULT_OOM;
> - else
> - return VM_FAULT_SIGBUS;
> + return VM_FAULT_SIGBUS;
> }
>
> /*
> @@ -2707,11 +2703,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 from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
