Skip to content

Commit 311ffb5

Browse files
covanamroxanan1996
authored andcommitted
riscv: enable HAVE_ARCH_HUGE_VMAP for XIP kernel
BugLink: https://bugs.launchpad.net/bugs/2073788 commit 7bed51617401dab2be930b13ed5aacf581f7c8ef upstream. HAVE_ARCH_HUGE_VMAP also works on XIP kernel, so remove its dependency on !XIP_KERNEL. This also fixes a boot problem for XIP kernel introduced by the commit in "Fixes:". This commit used huge page mapping for vmemmap, but huge page vmap was not enabled for XIP kernel. Fixes: ff172d4 ("riscv: Use hugepage mappings for vmemmap") Signed-off-by: Nam Cao <namcao@linutronix.de> Cc: <stable@vger.kernel.org> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Link: https://lore.kernel.org/r/20240526110104.470429-1-namcao@linutronix.de Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
1 parent 706fcee commit 311ffb5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ config RISCV
9696
select HAS_IOPORT if MMU
9797
select HAVE_ARCH_AUDITSYSCALL
9898
select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP
99-
select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT && !XIP_KERNEL
99+
select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT
100100
select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
101101
select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
102102
select HAVE_ARCH_KASAN if MMU && 64BIT

0 commit comments

Comments
 (0)