Commit 2cfde72f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull pstore fix from Tony Luck:
 "Just one pstore fix this release"

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: Fix the ramoops module parameters update
parents ca2ec326 62f269ef

fs/pstore/ram.c

+3 −0
Original line number Diff line number Diff line
@@ -539,6 +539,9 @@ static int ramoops_probe(struct platform_device *pdev) 
	mem_address = pdata->mem_address;

	record_size = pdata->record_size;

	dump_oops = pdata->dump_oops;

	ramoops_console_size = pdata->console_size;

	ramoops_pmsg_size = pdata->pmsg_size;

	ramoops_ftrace_size = pdata->ftrace_size;



	pr_info("attached 0x%lx@0x%llx, ecc: %d/%d\n",

		cxt->size, (unsigned long long)cxt->phys_addr,