Skip to contentSkip to conversation

mm-meminit-mark-init_reserved_page-as-__meminit.patch removed from -mm tree

merged [email protected] 1 participant 1 message Oct 4, 2017

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm: meminit: mark init_reserved_page as __meminit
has been removed from the -mm tree. Its filename was
mm-meminit-mark-init_reserved_page-as-__meminit.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Arnd Bergmann <[email protected]>
Subject: mm: meminit: mark init_reserved_page as __meminit

The function is called from __meminit context and calls other __meminit functions but isn't it self mark as such today:

WARNING: vmlinux.o(.text.unlikely+0x4516): Section mismatch in reference from the function init_reserved_page() to the function .meminit.text:early_pfn_to_nid() The function init_reserved_page() references
the function __meminit early_pfn_to_nid().
This is often because init_reserved_page lacks a __meminit
annotation or the annotation of early_pfn_to_nid is wrong.

On most compilers, we don't notice this because the function gets inlined all the time. Adding __meminit here fixes the harmless warning for the old versions and is generally the correct annotation.

Fixes 7e18adb4f80b ("mm: meminit: initialise remaining struct pages in parallel with kswapd")

---

 mm/page_alloc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_alloc.c renamed from mm/page_alloc.c~mm-meminit-mark-init_reserved_page-as-__meminit +1 -1
diff -puN mm/page_alloc.c~mm-meminit-mark-init_reserved_page-as-__meminit mm/page_alloc.c
@@ -1190,7 +1190,7 @@ static void __meminit __init_single_pfn(
 }
 
 #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-static void init_reserved_page(unsigned long pfn)
+static void __meminit init_reserved_page(unsigned long pfn)
 {
 	pg_data_t *pgdat;
 	int nid, zid;

_

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

of-provide-of_n_addrsize_cells-wrappers-for-config_of.patch iopoll-avoid-wint-in-bool-context-warning.patch pcmcia-badge4-avoid-unused-function-warning.patch