Merge branch 'riscv-wx-mappings' into for-next
authorPalmer Dabbelt <palmerdabbelt@google.com>
Thu, 1 Jul 2021 04:50:32 +0000 (21:50 -0700)
committerPalmer Dabbelt <palmerdabbelt@google.com>
Thu, 1 Jul 2021 04:50:32 +0000 (21:50 -0700)
commit01112e5e20f5298a81639806cd0a3c587aade467
treeb453c32b2e3a8905da331a81ad234c17b62cb9dc
parent47513f243b452a5e21180dcf3d6ac1c57e1781a6
parente5c35fa0401971701dcd7675f471b664698244dd
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
arch/riscv/Kconfig
arch/riscv/include/asm/page.h
arch/riscv/include/asm/pgtable.h
arch/riscv/kernel/setup.c
arch/riscv/mm/init.c