aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@android.com>2015-01-13 17:32:35 -0500
committerTony Luck <tony.luck@intel.com>2015-01-16 18:45:46 -0500
commitff6bf6e8024f073ecea7dbf5c6afe6bd3872a569 (patch)
tree19ccfb518f56dafa8124f52c96ccdc195d440065 /fs
parentdbaffde76405012778b8815b7721554b1302038e (diff)
pstore: Remove superfluous memory size check
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/ram.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 8613e5b35c22..34ed8f860e23 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -474,14 +474,6 @@ static int ramoops_probe(struct platform_device *pdev)
474 if (err) 474 if (err)
475 goto fail_init_fprz; 475 goto fail_init_fprz;
476 476
477 if (!cxt->przs && !cxt->cprz && !cxt->fprz) {
478 pr_err("memory size too small, minimum is %zu\n",
479 cxt->console_size + cxt->record_size +
480 cxt->ftrace_size);
481 err = -EINVAL;
482 goto fail_cnt;
483 }
484
485 cxt->pstore.data = cxt; 477 cxt->pstore.data = cxt;
486 /* 478 /*
487 * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we 479 * Console can handle any buffer size, so prefer LOG_LINE_MAX. If we
@@ -525,7 +517,6 @@ fail_buf:
525 kfree(cxt->pstore.buf); 517 kfree(cxt->pstore.buf);
526fail_clear: 518fail_clear:
527 cxt->pstore.bufsize = 0; 519 cxt->pstore.bufsize = 0;
528fail_cnt:
529 kfree(cxt->fprz); 520 kfree(cxt->fprz);
530fail_init_fprz: 521fail_init_fprz:
531 kfree(cxt->cprz); 522 kfree(cxt->cprz);