diff options
| -rw-r--r-- | mm/memblock.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index e2a4205fc582..cc5ee323245e 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2160,11 +2160,14 @@ static void __init memmap_init_reserved_pages(void) struct memblock_region *region; phys_addr_t start, end; int nid; + unsigned long max_reserved; /* * set nid on all reserved pages and also treat struct * pages for the NOMAP regions as PageReserved */ +repeat: + max_reserved = memblock.reserved.max; for_each_mem_region(region) { nid = memblock_get_region_node(region); start = region->base; @@ -2175,6 +2178,13 @@ static void __init memmap_init_reserved_pages(void) 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 reserved regions that don't have |