mirror of
https://github.com/torvalds/linux.git
synced 2026-09-25 21:21:09 -04:00
memblock: check memory total_size
mem=[X][G|M] is broken on ARM64 platform, there are cases that even
type.cnt is 1, but total_size is not 0 because regions are merged into
1. So only check 'cnt' is not enough, total_size should be used,
othersize bootargs 'mem=[X][G|B]' not work anymore.
Link: https://lkml.kernel.org/r/[email protected]
Fixes: e888fa7bb8 ("memblock: Check memory add/cap ordering")
Signed-off-by: Peng Fan <[email protected]>
Reviewed-by: Mike Rapoport <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: David Hildenbrand <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
+1
-1
@@ -1692,7 +1692,7 @@ void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
|
||||
if (!size)
|
||||
return;
|
||||
|
||||
if (memblock.memory.cnt <= 1) {
|
||||
if (!memblock_memory->total_size) {
|
||||
pr_warn("%s: No memory registered yet\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user