samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4d1a2d1363 ("mm/memblock: repeat setting reserved region nid if array is doubled") into android-mainline

Browse Source 
Steps on the way to 6.6.90

Change-Id: I2baed159d1b8e3cc3aa36a017a77f7075a0acdfb
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2025-05-21 10:01:27 +00:00
parent bf30bf594d 4d1a2d1363
commit 4f41bfdbc0
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mm/memblock.c
View File

@@ -2440,11 +2440,14 @@ static void __init memmap_init_reserved_pages(void)
struct memblock_region *region; struct memblock_region *region;
phys_addr_t start, end; phys_addr_t start, end;
int nid; int nid;
unsigned long max_reserved;
/* /*
* set nid on all reserved pages and also treat struct * set nid on all reserved pages and also treat struct
* pages for the NOMAP regions as PageReserved * pages for the NOMAP regions as PageReserved
*/ */
repeat:
max_reserved = memblock.reserved.max;
for_each_mem_region(region) { for_each_mem_region(region) {
nid = memblock_get_region_node(region); nid = memblock_get_region_node(region);
start = region->base; start = region->base;
@@ -2455,6 +2458,13 @@ static void __init memmap_init_reserved_pages(void)
memblock_set_node(start, region->size, &memblock.reserved, nid); memblock_set_node(start, region->size, &memblock.reserved, nid);
} }
/*
* 'max' is changed means memblock.reserved has been doubled its
* array, which may result a new reserved region before current
* 'start'. Now we should repeat the procedure to set its node id.
*/
if (max_reserved != memblock.reserved.max)
goto repeat;
/* initialize struct pages for the reserved regions */ /* initialize struct pages for the reserved regions */
for_each_reserved_mem_region(region) { for_each_reserved_mem_region(region) {