diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 15:58:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 15:58:56 -0700 |
| commit | 2cfde72f0f26d3df7e565c5dce687c372042feba (patch) | |
| tree | 77f4be157fdb20263cad5e38d81531d2d780450b /fs | |
| parent | Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| parent | pstore: Fix the ramoops module parameters update (diff) | |
| download | linux-dev-2cfde72f0f26d3df7e565c5dce687c372042feba.tar.xz linux-dev-2cfde72f0f26d3df7e565c5dce687c372042feba.zip | |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 39d1373128e9..44a549beeafa 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, |