Skip to content

Commit 3ee37ab

Browse files
committed
Merge tag 'pstore-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore update from Kees Cook: - pstore/ram: Update module parameters from platform data (Tzung-Bi Shih) * tag 'pstore-v6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: pstore/ram: Update module parameters from platform data
2 parents 5d45c72 + b692553 commit 3ee37ab

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

fs/pstore/ram.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,8 @@ static int ramoops_probe(struct platform_device *pdev)
864864
ramoops_console_size = pdata->console_size;
865865
ramoops_pmsg_size = pdata->pmsg_size;
866866
ramoops_ftrace_size = pdata->ftrace_size;
867+
mem_type = pdata->mem_type;
868+
ramoops_ecc = pdata->ecc_info.ecc_size;
867869

868870
pr_info("using 0x%lx@0x%llx, ecc: %d\n",
869871
cxt->size, (unsigned long long)cxt->phys_addr,

0 commit comments

Comments
 (0)