summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 22:58:56 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-14 22:58:56 (GMT)
commit2cfde72f0f26d3df7e565c5dce687c372042feba (patch)
tree77f4be157fdb20263cad5e38d81531d2d780450b /fs
parentca2ec32658db160745990496f0f4580056a5dc9f (diff)
parent62f269ef819156889b121ae27998e928b784c219 (diff)
downloadlinux-2cfde72f0f26d3df7e565c5dce687c372042feba.tar.xz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/ram.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 39d1373..44a549b 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -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,