diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-08-19 10:48:39 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-08-19 10:48:46 +0200 |
| commit | 41776e40082b06c79c3c069559d6ab6664394113 (patch) | |
| tree | f7e8543ac6b7d0a7ba73f2bbe715ef9984783378 /mm/sparse.c | |
| parent | 1026392d10af7b35361c7ec4e14569d88c0c33e4 (diff) | |
| parent | 3531df81dca2f42accbc11821c5fa28e4104efd5 (diff) | |
Merge branch 'topic/seq-filter-cleanup' into for-next
Pull ALSA sequencer cleanup.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'mm/sparse.c')
| -rw-r--r-- | mm/sparse.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index e4b830091d13..0f018c6f9ec5 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -463,7 +463,7 @@ static void __init sparse_buffer_init(unsigned long size, int nid) sparsemap_buf = memmap_alloc(size, section_map_size(), addr, nid, true); sparsemap_buf_end = sparsemap_buf + size; #ifndef CONFIG_SPARSEMEM_VMEMMAP - mod_node_early_perpage_metadata(nid, DIV_ROUND_UP(size, PAGE_SIZE)); + memmap_boot_pages_add(DIV_ROUND_UP(size, PAGE_SIZE)); #endif } @@ -643,8 +643,7 @@ static void depopulate_section_memmap(unsigned long pfn, unsigned long nr_pages, unsigned long start = (unsigned long) pfn_to_page(pfn); unsigned long end = start + nr_pages * sizeof(struct page); - mod_node_page_state(page_pgdat(pfn_to_page(pfn)), NR_MEMMAP, - -1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); + memmap_pages_add(-1L * (DIV_ROUND_UP(end - start, PAGE_SIZE))); vmemmap_free(start, end, altmap); } static void free_map_bootmem(struct page *memmap) |