diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2024-04-09 20:41:01 +0200 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2024-04-09 20:41:01 +0200 |
| commit | a373a36fb6b024ac1d87fc04c97c75621b574c30 (patch) | |
| tree | bc8edf4468dce6a1cdd6853ee2ce46bab737b02a /arch/riscv/include/asm/page.h | |
| parent | riscv: process: Fix kernel gp leakage (diff) | |
| parent | riscv: Fix loading 64-bit NOMMU kernels past the start of RAM (diff) | |
| download | linux-a373a36fb6b024ac1d87fc04c97c75621b574c30.tar.xz linux-a373a36fb6b024ac1d87fc04c97c75621b574c30.zip | |
Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements"
These two patches are fixes that the feature depends on, but they also
fix generic issues. So I'm picking them up for fixes as well as
for-next.
* commit 'aea702dde7e9876fb00571a2602f25130847bf0f':
riscv: Fix loading 64-bit NOMMU kernels past the start of RAM
riscv: Fix TASK_SIZE on 64-bit NOMMU
Link: https://lore.kernel.org/r/20240227003630.3634533-1-samuel.holland@sifive.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch/riscv/include/asm/page.h')
| -rw-r--r-- | arch/riscv/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h index 2947423b5082..115ac98b8d72 100644 --- a/arch/riscv/include/asm/page.h +++ b/arch/riscv/include/asm/page.h @@ -89,7 +89,7 @@ typedef struct page *pgtable_t; #define PTE_FMT "%08lx" #endif -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) && defined(CONFIG_MMU) /* * We override this value as its generic definition uses __pa too early in * the boot process (before kernel_map.va_pa_offset is set). |