Skip to content

Commit ab952fc

Browse files
committed
Merge tag 'memblock-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock
Pull memblock updates from Mike Rapoport: - replace hardcoded strings with str_on_off() in report_meminit() - initialize reserved pages to MIGRATE_MOVABLE when deferred struct page initialization is enabled so that if the reserved pages are freed they are put on movable free lists like it is done now when deferred struct page initialization is disabled * tag 'memblock-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock: memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE mm: Use str_on_off() helper function in report_meminit()
2 parents b536125 + 98b7beb commit ab952fc

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

mm/mm_init.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,9 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid)
722722
break;
723723
}
724724
__init_single_page(pfn_to_page(pfn), pfn, zid, nid);
725+
726+
if (pageblock_aligned(pfn))
727+
set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE);
725728
}
726729
#else
727730
static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {}
@@ -2572,8 +2575,8 @@ static void __init report_meminit(void)
25722575
stack = "off";
25732576

25742577
pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n",
2575-
stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off",
2576-
want_init_on_free() ? "on" : "off");
2578+
stack, str_on_off(want_init_on_alloc(GFP_KERNEL)),
2579+
str_on_off(want_init_on_free()));
25772580
if (want_init_on_free())
25782581
pr_info("mem auto-init: clearing system memory may take some time...\n");
25792582
}

0 commit comments

Comments
 (0)