diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
| commit | d4ea2bd1bb502c54380cc44a4130660494679bb8 (patch) | |
| tree | 7d14962a86c24026ce2eee8f9e67db610db23fd8 /mm/memblock.c | |
| parent | eaa1b01fe709d6a236a9cec74813e0400601fd23 (diff) | |
| parent | e81fdba0208666b65bafeaba814874b4d6e5edde (diff) | |
| download | linux-d4ea2bd1bb502c54380cc44a4130660494679bb8.tar.xz | |
Merge tag 'asoc-fix-v6.8-rc2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8
This pull request adds Richard Fitzgerald's series with extensive fixes
for the CS35L56, he said:
These patches fix various things that were undocumented, unknown or
uncertain when the original driver code was written. And also a few
things that were just bugs.
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); } } |