]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
pstore: Remove superfluous memory size check
authorMark Salyzyn <salyzyn@android.com>
Tue, 13 Jan 2015 22:32:35 +0000 (14:32 -0800)
committerTony Luck <tony.luck@intel.com>
Fri, 16 Jan 2015 23:45:46 +0000 (15:45 -0800)
All previous checks will fail with error if memory size
is not sufficient to register a zone, so this legacy
check has become redundant.

Signed-off-by: Mark Salyzyn <salyzyn@android.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
fs/pstore/ram.c

index 8613e5b35c22423df808172fa408985191ccc1a2..34ed8f860e23217ae4337c45a7225959606722ba 100644 (file)
@@ -474,14 +474,6 @@ static int ramoops_probe(struct platform_device *pdev)
        if (err)
                goto fail_init_fprz;
 
-       if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
-               pr_err("memory size too small, minimum is %zu\n",
-                       cxt->console_size + cxt->record_size +
-                       cxt->ftrace_size);
-               err = -EINVAL;
-               goto fail_cnt;
-       }
-
        cxt->pstore.data = cxt;
        /*
         * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
@@ -525,7 +517,6 @@ fail_buf:
        kfree(cxt->pstore.buf);
 fail_clear:
        cxt->pstore.bufsize = 0;
-fail_cnt:
        kfree(cxt->fprz);
 fail_init_fprz:
        kfree(cxt->cprz);