RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename
authorConor Dooley <conor.dooley@microchip.com>
Sat, 29 Apr 2023 09:27:33 +0000 (10:27 +0100)
committerPalmer Dabbelt <palmer@rivosinc.com>
Sat, 29 Apr 2023 22:33:10 +0000 (15:33 -0700)
commit26b0812f4cf824a02eec9a425c09e34a25420166
treefefb8842f0893043309edd77d3dcf8e72093b376
parenta2a58b5ca124f4a0178d0ada801f1ed2c84c393d
RISC-V: fixup in-flight collision with ARCH_WANT_OPTIMIZE_VMEMMAP rename

Lukas warned that ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP had been
renamed in the mm tree & that RISC-V would need a fixup as part of the
merge. The warning was missed however, and RISC-V is selecting the
orphaned Kconfig option.

Fixes: 89d77f71f493 ("Merge tag 'riscv-for-linus-6.4-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux")
Reported-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>.
Link: https://lore.kernel.org/linux-riscv/CAKXUXMyVeg2kQK_edKHtMD3eADrDK_PKhCSVkMrLDdYgTQQ5rg@mail.gmail.com/
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Link: https://lore.kernel.org/r/20230429-trilogy-jolly-12bf5c53d62d@spud
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/Kconfig