Commit 70eba422 authored May 09, 2013 by Linus Torvalds

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

parents 2d4fe278 47110b88

fs/pstore/ram.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -438,6 +438,7 @@ static int ramoops_probe(struct platform_device *pdev)
		pr_err("memory size too small, minimum is %zu\n",
		cxt->console_size + cxt->record_size +
		cxt->ftrace_size);
		err = -EINVAL;
		goto fail_cnt;
		}

		@@ -455,6 +456,7 @@ static int ramoops_probe(struct platform_device *pdev)
		spin_lock_init(&cxt->pstore.buf_lock);
		if (!cxt->pstore.buf) {
		pr_err("cannot allocate pstore buffer\n");
		err = -ENOMEM;
		goto fail_clear;
		}