Merge branch 'riscv-wx-mappings' into for-next

This contains both the short-term fix for the W+X boot mappings and the larger cleanup. * riscv-wx-mappings: riscv: Map the kernel with correct permissions the first time riscv: Introduce set_kernel_memory helper riscv: Simplify xip and !xip kernel address conversion macros riscv: Remove CONFIG_PHYS_RAM_BASE_FIXED riscv: mm: Fix W+X mappings at boot
2026-10-14 05:55:17 +00:00 · 2021-06-30 21:50:32 -07:00 · 2021-06-30 21:50:32 -07:00 · 01112e5e20
commit 01112e5e20
parent 47513f243b e5c35fa040
7 changed files with 102 additions and 94 deletions
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
--- a/arch/riscv/include/asm/page.h
+++ b/arch/riscv/include/asm/page.h
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
--- a/arch/riscv/include/asm/sections.h
+++ b/arch/riscv/include/asm/sections.h
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c