提交 70eba422 编写于 作者: L Linus Torvalds

Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull trivial pstore update from Tony Luck:
 "Couple of pstore cleanups"

It turns out that the kmemdup() conversion ends up being undone by the
fact that the memory block also needed the ecc information (see commit
bd08ec33: "pstore/ram: Restore ecc information block"), so all that
remains after merging is the error return code change.

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore/ram: fix error return code in ramoops_probe()
  fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup
...@@ -438,6 +438,7 @@ static int ramoops_probe(struct platform_device *pdev) ...@@ -438,6 +438,7 @@ static int ramoops_probe(struct platform_device *pdev)
pr_err("memory size too small, minimum is %zu\n", pr_err("memory size too small, minimum is %zu\n",
cxt->console_size + cxt->record_size + cxt->console_size + cxt->record_size +
cxt->ftrace_size); cxt->ftrace_size);
err = -EINVAL;
goto fail_cnt; goto fail_cnt;
} }
...@@ -455,6 +456,7 @@ static int ramoops_probe(struct platform_device *pdev) ...@@ -455,6 +456,7 @@ static int ramoops_probe(struct platform_device *pdev)
spin_lock_init(&cxt->pstore.buf_lock); spin_lock_init(&cxt->pstore.buf_lock);
if (!cxt->pstore.buf) { if (!cxt->pstore.buf) {
pr_err("cannot allocate pstore buffer\n"); pr_err("cannot allocate pstore buffer\n");
err = -ENOMEM;
goto fail_clear; goto fail_clear;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册