Skip to content

Commit 7bed516

Browse files
covanampalmer-dabbelt
authored andcommitted
riscv: enable HAVE_ARCH_HUGE_VMAP for XIP kernel
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>
1 parent a638b04 commit 7bed516

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/riscv/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ config RISCV
106106
select HAS_IOPORT if MMU
107107
select HAVE_ARCH_AUDITSYSCALL
108108
select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP
109-
select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT && !XIP_KERNEL
109+
select HAVE_ARCH_HUGE_VMAP if MMU && 64BIT
110110
select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL
111111
select HAVE_ARCH_JUMP_LABEL_RELATIVE if !XIP_KERNEL
112112
select HAVE_ARCH_KASAN if MMU && 64BIT

0 commit comments

Comments
 (0)