Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mm/memblock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1811,7 +1811,6 @@ phys_addr_t __init_memblock memblock_end_of_DRAM(void)

static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)
{
phys_addr_t phys_ram_base = memblock_start_of_DRAM();
phys_addr_t max_addr = PHYS_ADDR_MAX;
struct memblock_region *r;

Expand All @@ -1821,10 +1820,11 @@ static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)
* of those regions, max_addr will keep original value PHYS_ADDR_MAX
*/
for_each_mem_region(r) {
if ((r->base + r->size) >= (phys_ram_base + limit)) {
max_addr = phys_ram_base + limit;
if (limit <= r->size) {
max_addr = r->base + limit;
break;
}
limit -= r->size;
}

return max_addr;
Expand Down
Loading