Unverified Commit 444818b5 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

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 c9811e37 ("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
parents e73f0f0e d0e4dae7

arch/riscv/mm/init.c

+1 −0
Original line number Diff line number Diff line
@@ -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