| Message ID | 20190709185528.3251709-1-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | mm/sparse.c: mark sparse_buffer_free as __meminit | expand |
diff --git a/mm/sparse.c b/mm/sparse.c index 3267c4001c6d..4801d45bd66e 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -470,7 +470,7 @@ struct page __init *__populate_section_memmap(unsigned long pfn, static void *sparsemap_buf __meminitdata; static void *sparsemap_buf_end __meminitdata; -static inline void __init sparse_buffer_free(unsigned long size) +static inline void __meminit sparse_buffer_free(unsigned long size) { WARN_ON(!sparsemap_buf || size == 0); memblock_free_early(__pa(sparsemap_buf), size);
Calling an __init function from a __meminit function is not allowed: WARNING: vmlinux.o(.meminit.text+0x30ff): Section mismatch in reference from the function sparse_buffer_alloc() to the function .init.text:sparse_buffer_free() The function __meminit sparse_buffer_alloc() references a function __init sparse_buffer_free(). If sparse_buffer_free is only used by sparse_buffer_alloc then annotate sparse_buffer_free with a matching annotation. Downgrade the annotation to __meminit for both, as they may be used in the hotplug case. Fixes: mmotm ("mm/sparse.c: fix memory leak of sparsemap_buf in aliged memory") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- mm/sparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0