|
@@ -101,6 +101,7 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|
|
{
|
|
|
phys_addr_t this_start, this_end, cand;
|
|
|
u64 i;
|
|
|
+ int curr = movablemem_map.nr_map - 1;
|
|
|
|
|
|
/* pump up @end */
|
|
|
if (end == MEMBLOCK_ALLOC_ACCESSIBLE)
|
|
@@ -114,13 +115,28 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start,
|
|
|
this_start = clamp(this_start, start, end);
|
|
|
this_end = clamp(this_end, start, end);
|
|
|
|
|
|
- if (this_end < size)
|
|
|
+restart:
|
|
|
+ if (this_end <= this_start || this_end < size)
|
|
|
continue;
|
|
|
|
|
|
+ for (; curr >= 0; curr--) {
|
|
|
+ if ((movablemem_map.map[curr].start_pfn << PAGE_SHIFT)
|
|
|
+ < this_end)
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
cand = round_down(this_end - size, align);
|
|
|
+ if (curr >= 0 &&
|
|
|
+ cand < movablemem_map.map[curr].end_pfn << PAGE_SHIFT) {
|
|
|
+ this_end = movablemem_map.map[curr].start_pfn
|
|
|
+ << PAGE_SHIFT;
|
|
|
+ goto restart;
|
|
|
+ }
|
|
|
+
|
|
|
if (cand >= this_start)
|
|
|
return cand;
|
|
|
}
|
|
|
+
|
|
|
return 0;
|
|
|
}
|
|
|
|