summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHan Gao <gaohan@iscas.ac.cn>2026-05-19 19:55:46 +0300
committerPaul Walmsley <pjw@kernel.org>2026-06-07 14:10:01 +0300
commitbce35135fecc7a73c60aaa9d2ec699ead1e32661 (patch)
tree9c35a8815e8e238fa95626ccfc480b760cf273e3
parentd3e0634787a234b40a740b9c398fd320a68db81c (diff)
downloadlinux-bce35135fecc7a73c60aaa9d2ec699ead1e32661.tar.xz
riscv: also select ARCH_KEEP_MEMBLOCK if kexec is selected
On RISC-V, also select ARCH_KEEP_MEMBLOCK if kexec is selected, not only if ACPI is selected. This is because kexec requires the memblock areas to be kept after boot to initialize the secondary kernel. This is needed for both Device Tree and ACPI platforms. Signed-off-by: Han Gao <gaohan@iscas.ac.cn> Link: https://patch.msgid.link/20260519165546.123105-1-gaohan@iscas.ac.cn [pjw@kernel.org: change to add the dependency on kexec, rather than making it unconditional; rewrite the patch description accordingly] Signed-off-by: Paul Walmsley <pjw@kernel.org>
-rw-r--r--arch/riscv/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index ce5f4342e2f2..ca7dfbbefca0 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -56,7 +56,7 @@ config RISCV
select ARCH_HAS_UBSAN
select ARCH_HAS_VDSO_ARCH_DATA if HAVE_GENERIC_VDSO
select ARCH_HAVE_NMI_SAFE_CMPXCHG
- select ARCH_KEEP_MEMBLOCK if ACPI
+ select ARCH_KEEP_MEMBLOCK if ACPI || KEXEC
select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if 64BIT && MMU
select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT