mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
mem-hotplug: let memblock skip the hotpluggable memory regions in __next_mem_range()
Let memblock skip the hotpluggable memory regions in __next_mem_range(), it is used to to prevent memblock from allocating hotpluggable memory for the kernel at early time. The code is the same as __next_mem_range_rev(). Clear hotpluggable flag before releasing free pages to the buddy allocator. If we don't clear hotpluggable flag in free_low_memory_core_early(), the memory which marked hotpluggable flag will not free to buddy allocator. Because __next_mem_range() will skip them. free_low_memory_core_early for_each_free_mem_range for_each_mem_range __next_mem_range [[email protected]: fix warning] Signed-off-by: Xishi Qiu <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Tang Chen <[email protected]> Cc: Zhang Yanfei <[email protected]> Cc: Wen Congyang <[email protected]> Cc: "Rafael J. Wysocki" <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Wu Fengguang <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
619df5d287
commit
0a313a998a
2 changed files with 6 additions and 0 deletions
|
|
@ -816,6 +816,10 @@ void __init_memblock __next_mem_range(u64 *idx, int nid,
|
|||
if (nid != NUMA_NO_NODE && nid != m_nid)
|
||||
continue;
|
||||
|
||||
/* skip hotpluggable memory regions if needed */
|
||||
if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
|
||||
continue;
|
||||
|
||||
if (!type_b) {
|
||||
if (out_start)
|
||||
*out_start = m_start;
|
||||
|
|
|
|||
|
|
@ -119,6 +119,8 @@ static unsigned long __init free_low_memory_core_early(void)
|
|||
phys_addr_t start, end;
|
||||
u64 i;
|
||||
|
||||
memblock_clear_hotplug(0, -1);
|
||||
|
||||
for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
|
||||
count += __free_memory_core(start, end);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue