Merge "arm64: fix bootloader_memory_limit"

This commit is contained in:
qctecmdr 2021-03-04 04:46:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit c073c18fe7

View file

@ -454,10 +454,9 @@ void __init arm64_memblock_init(void)
* Save bootloader imposed memory limit before we overwirte
* memblock.
*/
if (memory_limit == PHYS_ADDR_MAX)
bootloader_memory_limit = memblock_max_addr(memory_limit);
if (bootloader_memory_limit > memblock_end_of_DRAM())
bootloader_memory_limit = memblock_end_of_DRAM();
else
bootloader_memory_limit = memblock_max_addr(memory_limit);
update_memory_limit();