Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e0bf304e authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: fix memory setup for platforms with PHYS_OFFSET != 0 



For platforms, which use a PHYS_OFFSET != 0, symbol _end also
contains that offset. So when calling memblock_reserve() for
reserving kernel the size argument needs to be adjusted.

Fixes: bcec54bf ("mips: switch to NO_BOOTMEM")
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org # v4.20+
parent 18836b48

arch/mips/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -384,7 +384,8 @@ static void __init bootmem_init(void) 
	init_initrd();

	reserved_end = (unsigned long) PFN_UP(__pa_symbol(&_end));



	memblock_reserve(PHYS_OFFSET, reserved_end << PAGE_SHIFT);

	memblock_reserve(PHYS_OFFSET,

			 (reserved_end << PAGE_SHIFT) - PHYS_OFFSET);



	/*

	 * max_low_pfn is not a number of pages. The number of pages