Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 f65e91df25aa ("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: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds 9 years ago
parent
af7d93729c
commit
7ded384a12
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      include/linux/memory_hotplug.h
  2. 1 1
      mm/memory_hotplug.c

+ 1 - 1
include/linux/memory_hotplug.h
View File 

@@ -182,7 +182,7 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat)
 
 #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */
 
 
 #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
 
 static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
 
 {

+ 1 - 1
mm/memory_hotplug.c
View File 

@@ -263,7 +263,7 @@ static void register_page_bootmem_info_section(unsigned long start_pfn)
 
 }
 
 #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;
 
 	int node = pgdat->node_id;