Commit ab952fc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents b5361254 98b7beba

mm/mm_init.c

+5 −2
Original line number Diff line number Diff line
@@ -722,6 +722,9 @@ static void __meminit init_reserved_page(unsigned long pfn, int nid) 
			break;

	}

	__init_single_page(pfn_to_page(pfn), pfn, zid, nid);



	if (pageblock_aligned(pfn))

		set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_MOVABLE);

}

#else

static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {}
@@ -2572,8 +2575,8 @@ static void __init report_meminit(void) 
		stack = "off";



	pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n",

		stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off",

		want_init_on_free() ? "on" : "off");

		stack, str_on_off(want_init_on_alloc(GFP_KERNEL)),

		str_on_off(want_init_on_free()));

	if (want_init_on_free())

		pr_info("mem auto-init: clearing system memory may take some time...\n");

}