diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-06-30 21:50:32 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-06-30 21:50:32 -0700 |
| commit | 01112e5e20f5298a81639806cd0a3c587aade467 (patch) | |
| tree | b453c32b2e3a8905da331a81ad234c17b62cb9dc /arch/riscv/include/asm/pgtable.h | |
| parent | 47513f243b452a5e21180dcf3d6ac1c57e1781a6 (diff) | |
| parent | e5c35fa0401971701dcd7675f471b664698244dd (diff) | |
| download | linux-01112e5e20f5298a81639806cd0a3c587aade467.tar.gz linux-01112e5e20f5298a81639806cd0a3c587aade467.tar.bz2 linux-01112e5e20f5298a81639806cd0a3c587aade467.zip | |
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
Diffstat (limited to 'arch/riscv/include/asm/pgtable.h')
| -rw-r--r-- | arch/riscv/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index f282f7a375e2..2056faf06f13 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -77,6 +77,8 @@ #ifdef CONFIG_XIP_KERNEL #define XIP_OFFSET SZ_8M +#else +#define XIP_OFFSET 0 #endif #ifndef __ASSEMBLY__ |