diff options
| author | Kees Cook <keescook@chromium.org> | 2022-10-11 13:01:09 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2022-10-17 13:14:32 -0700 |
| commit | 6daf4e82bd54ef004ace4dd6deed60a32c282a95 (patch) | |
| tree | dcf09a35d0f1d56e0fe4f9b5a77c17e7016b3d99 /fs/pstore | |
| parent | 3219122b8cdd580f0793e803d4e80ecd7384cf17 (diff) | |
| download | linux-6daf4e82bd54ef004ace4dd6deed60a32c282a95.tar.gz linux-6daf4e82bd54ef004ace4dd6deed60a32c282a95.tar.bz2 linux-6daf4e82bd54ef004ace4dd6deed60a32c282a95.zip | |
pstore/ram: Move pmsg init earlier
Since the ftrace area can vary in size based on CPU count, move pmsg
initialization earlier so it will have a stable location.
Suggested-by: Paramjit Oberoi <pso@chromium.org>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed: Guilherme G. Piccoli <gpiccoli@igalia.com>
Link: https://lore.kernel.org/r/20221011200112.731334-3-keescook@chromium.org
Diffstat (limited to 'fs/pstore')
| -rw-r--r-- | fs/pstore/ram.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 348820a3ce88..2f18563c8141 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -785,6 +785,11 @@ static int ramoops_probe(struct platform_device *pdev) if (err) goto fail_init; + err = ramoops_init_prz("pmsg", dev, cxt, &cxt->mprz, &paddr, + cxt->pmsg_size, 0); + if (err) + goto fail_init; + cxt->max_ftrace_cnt = (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU) ? nr_cpu_ids : 1; @@ -796,11 +801,6 @@ static int ramoops_probe(struct platform_device *pdev) if (err) goto fail_init; - err = ramoops_init_prz("pmsg", dev, cxt, &cxt->mprz, &paddr, - cxt->pmsg_size, 0); - if (err) - goto fail_init; - cxt->pstore.data = cxt; /* * Prepare frontend flags based on which areas are initialized. |