[PATCH linux-next] riscv/mm: fix up the mm-fixes merge of free_pmd_table()
Andrew Morton
akpm at linux-foundation.org
Fri Oct 30 15:33:47 PDT 2026
On Fri, 30 Oct 2026 18:14:01 -0400 Sasha Levin <sashal at kernel.org> wrote:
> The mm-fixes merge reuses an older resolution of the conflict in
> remove_pud_mapping() and keeps the free_pmd_table() call that passes
> is_vmemmap. Commit f998a21c2ba5 ("riscv/mm: fix hotplug page-table
> destructor handling") in mm-fixes removed that argument, so a riscv
> build with CONFIG_MEMORY_HOTPLUG fails:
>
> arch/riscv/mm/init.c:1657:35: error: too many arguments to function call, expected 2, have 3
>
> Drop the argument to match the mm-fixes version of the call.
>
> ---
> Mark, this applies on top of next-20261030 and is meant to be folded into
> the mm-fixes merge resolution. Next/merge.log says it was resolved using
> a previous resolution, I think the one from the risc-v/mm conflict on
> 2026-10-12, which had the same problem (next-20261012 has it too).
Thanks. The "mm: Fix page-table teardown during memory hot-remove", v3
series was problematic, but I now have all four patches lined up in
Muchun's as-sent order in mm-hotfixes-unstable. I'll push that in the
next hour or three. Then hopefully any -next merge resolution can just
go away.
More information about the linux-riscv
mailing list