diff options
| author | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-07-22 07:18:58 +0200 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2021-07-22 07:18:58 +0200 |
| commit | 444818b599189fd8b6c814da542ff8cfc9fe67d4 (patch) | |
| tree | 0dfdee8bf784484a4048a1f57668fe59b160edac /arch/riscv/mm | |
| parent | Linux 5.14-rc1 (diff) | |
| parent | riscv: Fix 32-bit RISC-V boot failure (diff) | |
| download | linux-444818b599189fd8b6c814da542ff8cfc9fe67d4.tar.xz linux-444818b599189fd8b6c814da542ff8cfc9fe67d4.zip | |
Merge remote-tracking branch 'riscv/riscv-fix-32bit' into fixes
This contains a single fix for 32-bit boot. It happens this was already
fixed by c9811e379b21 ("riscv: Add mem kernel parameter support"), but
the bug existed before that feature addition so I've applied the patch
earlier and then merged it in (which results in a conflict, which is
fixed via not changing the resulting tree).
* riscv/riscv-fix-32bit:
riscv: Fix 32-bit RISC-V boot failure
Diffstat (limited to 'arch/riscv/mm')
| -rw-r--r-- | arch/riscv/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 269fc648ef3d..ac48742fa6fc 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -175,6 +175,7 @@ static void __init setup_bootmem(void) memblock_reserve(vmlinux_start, vmlinux_end - vmlinux_start); dram_end = memblock_end_of_DRAM(); + /* * memblock allocator is not aware of the fact that last 4K bytes of * the addressable memory can not be mapped because of IS_ERR_VALUE |