diff options
author | Chen Gang <gang.chen@asianux.com> | 2013-09-11 17:20:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:57:13 -0400 |
commit | 15ca220e1a63af06e000691e4ae1beaba5430c32 (patch) | |
tree | 01014ad3b3d7ddb407fee59d404e23026188db3e /mm/page_alloc.c | |
parent | a7e833182a926ae5bc03204dbd00b0bb5539088b (diff) |
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 <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 116bab1c2cf5..6cf157637df3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -4586,7 +4586,7 @@ static inline void setup_usemap(struct pglist_data *pgdat, struct zone *zone, | |||
4586 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE | 4586 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE |
4587 | 4587 | ||
4588 | /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ | 4588 | /* Initialise the number of pages represented by NR_PAGEBLOCK_BITS */ |
4589 | void __init set_pageblock_order(void) | 4589 | void __paginginit set_pageblock_order(void) |
4590 | { | 4590 | { |
4591 | unsigned int order; | 4591 | unsigned int order; |
4592 | 4592 | ||
@@ -4614,7 +4614,7 @@ void __init set_pageblock_order(void) | |||
4614 | * include/linux/pageblock-flags.h for the values of pageblock_order based on | 4614 | * include/linux/pageblock-flags.h for the values of pageblock_order based on |
4615 | * the kernel config | 4615 | * the kernel config |
4616 | */ | 4616 | */ |
4617 | void __init set_pageblock_order(void) | 4617 | void __paginginit set_pageblock_order(void) |
4618 | { | 4618 | { |
4619 | } | 4619 | } |
4620 | 4620 | ||