diff options
| author |   Mark Brown <broonie@kernel.org> | 2024-02-19 16:58:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-02-19 16:58:41 +0000 |
| commit | d68ce3aa8142333a96a071a9a0207f21c04e54cc (patch) | |
| tree | 15754707ec571eb08c8d6308fe2459e46b8a5468 /mm/memblock.c | |
| parent | dt-bindings: regulator: qcom,usb-vbus-regulator: Add PM6150 compatible (diff) | |
| parent | Linux 6.8-rc5 (diff) | |
| download | wireguard-linux-d68ce3aa8142333a96a071a9a0207f21c04e54cc.tar.xz wireguard-linux-d68ce3aa8142333a96a071a9a0207f21c04e54cc.zip | |
regulator: Merge up v6.8-rc5
There are dependencies on the PWM fixes for some new work on the PWM
driver.
Diffstat (limited to 'mm/memblock.c')
| -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); } } |