diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2024-02-02 12:11:07 +0100 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2024-02-02 12:11:07 +0100 |
| commit | 349bd87f6091ac68b8eab368ce30bcaf6d45c50e (patch) | |
| tree | f3b65442c181a4c2d52a070fcfa22e70ef9b5711 /mm | |
| parent | mm: thp_get_unmapped_area must honour topdown preference (diff) | |
| parent | Linux 6.8-rc2 (diff) | |
| download | linux-349bd87f6091ac68b8eab368ce30bcaf6d45c50e.tar.xz linux-349bd87f6091ac68b8eab368ce30bcaf6d45c50e.zip | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index abd92869874d..4dcb2ee35eca 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2176,6 +2176,9 @@ static void __init memmap_init_reserved_pages(void) start = region->base; end = start + region->size; + if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES) + nid = early_pfn_to_nid(PFN_DOWN(start)); + reserve_bootmem_region(start, end, nid); } } |