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

Commit 566edd21 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: fix bootloader_memory_limit"

parents aad10637 89bd219d
Loading
Loading
Loading
Loading
+2 −3
Original line number Original line Diff line number Diff line
@@ -508,10 +508,9 @@ void __init arm64_memblock_init(void)
	 * Save bootloader imposed memory limit before we overwirte
	 * Save bootloader imposed memory limit before we overwirte
	 * memblock.
	 * memblock.
	 */
	 */
	if (memory_limit == PHYS_ADDR_MAX)
		bootloader_memory_limit = memblock_end_of_DRAM();
	else
	bootloader_memory_limit = memblock_max_addr(memory_limit);
	bootloader_memory_limit = memblock_max_addr(memory_limit);
	if (bootloader_memory_limit > memblock_end_of_DRAM())
		bootloader_memory_limit = memblock_end_of_DRAM();


	update_memory_limit();
	update_memory_limit();