diff options
| author | Palmer Dabbelt <palmer@rivosinc.com> | 2024-04-09 11:41:01 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2024-04-09 11:41:01 -0700 |
| commit | a373a36fb6b024ac1d87fc04c97c75621b574c30 (patch) | |
| tree | bc8edf4468dce6a1cdd6853ee2ce46bab737b02a /arch/riscv/mm/init.c | |
| parent | d14fa1fcf69db9d070e75f1c4425211fa619dfc8 (diff) | |
| parent | aea702dde7e9876fb00571a2602f25130847bf0f (diff) | |
| download | linux-stable-a373a36fb6b024ac1d87fc04c97c75621b574c30.tar.gz linux-stable-a373a36fb6b024ac1d87fc04c97c75621b574c30.tar.bz2 linux-stable-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/mm/init.c')
| -rw-r--r-- | arch/riscv/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index fe8e159394d8..968761843203 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -231,7 +231,7 @@ static void __init setup_bootmem(void) * In 64-bit, any use of __va/__pa before this point is wrong as we * did not know the start of DRAM before. */ - if (IS_ENABLED(CONFIG_64BIT)) + if (IS_ENABLED(CONFIG_64BIT) && IS_ENABLED(CONFIG_MMU)) kernel_map.va_pa_offset = PAGE_OFFSET - phys_ram_base; /* |