Skip to contentSkip to conversation

mm/page_alloc.c: use '__paginginit' instead of '__init'

PATCH New Chen Gang 1 participant 1 message Jul 22, 2013

Subsystems (2)
Memory management Page allocator
lore
Share & tools
lore

Chen Gang

author
#0 lore raw

PATCH 1/1 mm/page_alloc.c: use '__paginginit' instead of '__init'

set_pageblock_order() may be called when memory hotplug, so need use '__paginginit' instead of '__init'.

The related warning:

The function __meminit .free_area_init_node() references a function __init .set_pageblock_order().
If .set_pageblock_order is only used by .free_area_init_node then annotate .set_pageblock_order with a matching annotation.

Signed-off-by Chen Gang <[email protected]>
---
 mm/page_alloc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
mm/page_alloc.c +2 -2
index b100255..4c58635 100644
@@ -4586,7 +4586,7 @@ static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone,
 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
 
 /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */
-void __init set_pageblock_order(void)
+void __paginginit set_pageblock_order(void)
 {
 	unsigned int order;
 

@@ -4614,7 +4614,7 @@ void __init set_pageblock_order(void)
  * include/linux/pageblock-flags.h for the values of pageblock_order based on
  * the kernel config
  */
-void __init set_pageblock_order(void)
+void __paginginit set_pageblock_order(void)
 {
 }
Signature · 7 lines
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>