Skip to contentSkip to conversation

mm-page_alloc-put-__free_pages_core-in-__meminit-section.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 12, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/page_alloc: put __free_pages_core() in __meminit section
has been removed from the -mm tree. Its filename was
mm-page_alloc-put-__free_pages_core-in-__meminit-section.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: mm/page_alloc: put __free_pages_core() in __meminit section
Date: Sat, 6 Jul 2024 06:16:15 +0000

__free_pages_core() is only used in bootmem init and hot-add memory init path. Let's put it in __meminit section.

---

 mm/memory_hotplug.c |    3 ++-
 mm/page_alloc.c     |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-page_alloc-put-__free_pages_core-in-__meminit-section +2 -1
@@ -628,7 +628,8 @@ int restore_online_page_callback(online_
 }
 EXPORT_SYMBOL_GPL(restore_online_page_callback);
 
-void generic_online_page(struct page *page, unsigned int order)
+/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
+void __ref generic_online_page(struct page *page, unsigned int order)
 {
 	__free_pages_core(page, order, MEMINIT_HOTPLUG);
 }
mm/page_alloc.c renamed from mm/page_alloc.c~mm-page_alloc-put-__free_pages_core-in-__meminit-section +1 -1
@@ -1219,7 +1219,7 @@ static void __free_pages_ok(struct page
 	__count_vm_events(PGFREE, 1 << order);
 }
 
-void __free_pages_core(struct page *page, unsigned int order,
+void __meminit __free_pages_core(struct page *page, unsigned int order,
 		enum meminit_context context)
 {
 	unsigned int nr_pages = 1 << order;

_

Patches currently in -mm which might be from [email protected] are