memcg: killed threads should not invoke memcg OOM killer

[mirror_ubuntu-bionic-kernel.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index 0607729abf3b5f937fbc76b8148c0acd61ed9e56..c586c09d766723e66baaddff967e2f9e50e50b12 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -348,12 +348,14 @@ int __init cma_declare_contiguous(phys_addr_t base,
 
        ret = cma_init_reserved_mem(base, size, order_per_bit, name, res_cma);
        if (ret)
-               goto err;
+               goto free_mem;
 
        pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
                &base);
        return 0;
 
+free_mem:
+       memblock_free(base, size);
 err:
        pr_err("Failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
        return ret;