diff options
| author | Mike Rapoport (Microsoft) <rppt@kernel.org> | 2026-08-07 11:47:13 +0300 |
|---|---|---|
| committer | Mike Rapoport (Microsoft) <rppt@kernel.org> | 2026-08-07 11:47:13 +0300 |
| commit | b3c1ec1a9ad84ec2f14d343d28c6032feaec5b79 (patch) | |
| tree | 12badd3feba28cb9c3f0587ac44b5e88f0bd00d3 | |
| parent | d606ff2083de59cff174f84cbac153fbc6d7c6b9 (diff) | |
| parent | 78fac571b06490654af45c902c7ab5f651fe7067 (diff) | |
Merge branch 'misc' into for-next
| -rw-r--r-- | mm/memblock.c | 4 | ||||
| -rw-r--r-- | mm/mm_init.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 6349c48154f4..43e036f3e11a 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -2224,10 +2224,8 @@ static void __init free_unused_memmap(void) } #ifdef CONFIG_SPARSEMEM - if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) { - prev_end = pageblock_align(end); + if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) free_memmap(prev_end, ALIGN(prev_end, PAGES_PER_SECTION)); - } #endif } diff --git a/mm/mm_init.c b/mm/mm_init.c index 3afebe5ab4ca..d87166a36ee8 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1665,7 +1665,6 @@ static void __init free_area_init_node(int nid) pgdat->node_id = nid; pgdat->node_start_pfn = start_pfn; - pgdat->per_cpu_nodestats = NULL; if (start_pfn != end_pfn) { pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid, @@ -1788,7 +1787,6 @@ static void __init free_area_init(void) } /* Find the PFNs that ZONE_MOVABLE begins at in each node */ - memset(zone_movable_pfn, 0, sizeof(zone_movable_pfn)); find_zone_movable_pfns_for_nodes(); /* Print out the zone ranges */ |