mm/sparse: correct init section annotations
Subsystems (2)
PATCH 1/1 mm/sparse: correct init section annotations
The !SPARSEMEM_EXTREME stub of sparse_index_init() has no annotation but the SPARSEMEM_EXTREME variant is __meminit. So mark the stub __meminit too.
mminit_validate_memmodel_limits() is only called by memory_present(), which is __init. So mark it __init.
sparse_usagebuf and sparse_usagebuf_end are only used by sparse_init_early_section(), sparse_usage_init() and sparse_usage_fini(), which are all __init. So mark them __initdata.
--- mm/sparse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/sparse.c +4 -4
@@ -104,7 +104,7 @@ int __meminit sparse_index_init(unsigned long section_nr, int nid) return 0; }#else /* !SPARSEMEM_EXTREME */ -int sparse_index_init (unsigned long section_nr,int nid) +int __meminit sparse_index_init (unsigned long section_nr,int nid) {return 0 ; }
@@ -127,7 +127,7 @@ static inline int sparse_early_nid(struct mem_section *section) }/* Validate the physical addressing limitations of the model */ -static void __meminit mminit_validate_memmodel_limits (unsigned long *start_pfn, +static void __init mminit_validate_memmodel_limits (unsigned long *start_pfn,unsigned long *end_pfn) {unsigned long max_sparsemem_pfn = (DIRECT_MAP_PHYSMEM_END +1 ) >>PAGE_SHIFT ;
@@ -249,8 +249,8 @@ void __weak __meminit vmemmap_populate_print_last(void) { } -static void *sparse_usagebuf__meminitdata ; -static void *sparse_usagebuf_end__meminitdata ; +static void *sparse_usagebuf__initdata ; +static void *sparse_usagebuf_end__initdata ;/* * Helper function that is used for generic section initialization, and
Signature · 1 line
2.43.0
Andrew Morton
maintainerQuoted 11 lines · On Sat, 1 Aug 2026 01:47:55 +0900 Sang-Heon Jeon <[email protected]> wrote:
The !SPARSEMEM_EXTREME stub of
sparse_index_init()has no annotation but theSPARSEMEM_EXTREMEvariant is__meminit. So mark the stub__meminittoo.
mminit_validate_memmodel_limits()is only called bymemory_present(), which is__init. So mark it__init.
sparse_usagebufandsparse_usagebuf_endare only used bysparse_init_early_section(),sparse_usage_init()andsparse_usage_fini(), which are all__init. So mark them__initdata.
lgtm, thanks.
mm/sparse.c int __meminit sparse_index_init(unsigned long section_nr, int nid) · line 110
Quoted 11 lines
mm/sparse.c +1
-1@@ -104,7 +104,7 @@ int __meminit sparse_index_init(unsigned long section_nr, int nid) return 0; }#else /* !SPARSEMEM_EXTREME */ -int sparse_index_init (unsigned long section_nr,int nid) +int __meminit sparse_index_init (unsigned long section_nr,int nid) {return 0 ; }
We could make this
#ifndef CONFIG_SPARSEMEM_EXTREME
static inline int __meminit sparse_index_init(unsigned long section_nr, int nid)
{
return 0;
}#endif
in a header and make it go away altogether.
Quoted 7 lines · Sang-Heon Jeon
The !SPARSEMEM_EXTREME stub of
sparse_index_init()has no annotation but theSPARSEMEM_EXTREMEvariant is__meminit. So mark the stub__meminittoo.
mminit_validate_memmodel_limits()is only called bymemory_present(), which is__init. So mark it__init.
Quoted 6 lines
sparse_usagebufandsparse_usagebuf_endare only used bysparse_init_early_section(),sparse_usage_init()andsparse_usage_fini(), which are all__init. So mark them__initdata.Signed-off-by Sang-Heon Jeon <[email protected]>---
Signature · 3 lines
Cheers, David
Quoted 4 lines · Sang-Heon Jeon
The !SPARSEMEM_EXTREME stub of
sparse_index_init()has no annotation but theSPARSEMEM_EXTREMEvariant is__meminit. So mark the stub__meminittoo.
Quoted 8 lines
mminit_validate_memmodel_limits()is only called bymemory_present(), which is__init. So mark it__init.
sparse_usagebufandsparse_usagebuf_endare only used bysparse_init_early_section(),sparse_usage_init()andsparse_usage_fini(), which are all__init. So mark them__initdata.Signed-off-by Sang-Heon Jeon <[email protected]>
Signature · 2 lines
Sincerely yours, Mike.
Quoted 4 lines · Sang-Heon Jeon
The !SPARSEMEM_EXTREME stub of
sparse_index_init()has no annotation but theSPARSEMEM_EXTREMEvariant is__meminit. So mark the stub__meminittoo.
Quoted 8 lines
mminit_validate_memmodel_limits()is only called bymemory_present(), which is__init. So mark it__init.
sparse_usagebufandsparse_usagebuf_endare only used bysparse_init_early_section(),sparse_usage_init()andsparse_usage_fini(), which are all__init. So mark them__initdata.Signed-off-by Sang-Heon Jeon <[email protected]>
Quoted 41 lines
--- mm/sparse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)mm/sparse.c +4
-4@@ -104,7 +104,7 @@ int __meminit sparse_index_init(unsigned long section_nr, int nid) return 0; }#else /* !SPARSEMEM_EXTREME */ -int sparse_index_init (unsigned long section_nr,int nid) +int __meminit sparse_index_init (unsigned long section_nr,int nid) {return 0 ; }@@ -127,7 +127,7 @@ static inline int sparse_early_nid(struct mem_section *section) }/* Validate the physical addressing limitations of the model */ -static void __meminit mminit_validate_memmodel_limits (unsigned long *start_pfn, +static void __init mminit_validate_memmodel_limits (unsigned long *start_pfn,unsigned long *end_pfn) {unsigned long max_sparsemem_pfn = (DIRECT_MAP_PHYSMEM_END +1 ) >>PAGE_SHIFT ;@@ -249,8 +249,8 @@ void __weak __meminit vmemmap_populate_print_last(void) { } -static void *sparse_usagebuf__meminitdata ; -static void *sparse_usagebuf_end__meminitdata ; +static void *sparse_usagebuf__initdata ; +static void *sparse_usagebuf_end__initdata ;/* * Helper function that is used for generic section initialization, and Signature · 1 line
2.43.0