Commit 7ded384a authored by Linus Torvalds's avatar Linus Torvalds

mm: fix section mismatch warning

The register_page_bootmem_info_node() function needs to be marked __init
in order to avoid a new warning introduced by commit f65e91df ("mm:
use early_pfn_to_nid in register_page_bootmem_info_node").

Otherwise you'll get a warning about how a non-init function calls
early_pfn_to_nid (which is __meminit)

Cc: Yang Shi <yang.shi@linaro.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af7d9372
...@@ -182,7 +182,7 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) ...@@ -182,7 +182,7 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE #ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE
extern void register_page_bootmem_info_node(struct pglist_data *pgdat); extern void __init register_page_bootmem_info_node(struct pglist_data *pgdat);
#else #else
static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
{ {
......
...@@ -263,7 +263,7 @@ static void register_page_bootmem_info_section(unsigned long start_pfn) ...@@ -263,7 +263,7 @@ static void register_page_bootmem_info_section(unsigned long start_pfn)
} }
#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ #endif /* !CONFIG_SPARSEMEM_VMEMMAP */
void register_page_bootmem_info_node(struct pglist_data *pgdat) void __init register_page_bootmem_info_node(struct pglist_data *pgdat)
{ {
unsigned long i, pfn, end_pfn, nr_pages; unsigned long i, pfn, end_pfn, nr_pages;
int node = pgdat->node_id; int node = pgdat->node_id;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment