mm-provide-more-accurate-estimation-of-pages-occupied-by-memmap-fix

mark calc_memmap_size __paging_init

Cc: "Rafael J . Wysocki" <rjw@sisk.pl>
Cc: Chris Clayton <chris2553@googlemail.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Maciej Rutecki <maciej.rutecki@gmail.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7dc5ccc19f2eef0225a0215ded09f66867d1b271..965f0037c5ec67622953bd4e4389e3efdb3292a8 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4542,8 +4542,8 @@ void __init set_pageblock_order(void)
 
 #endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */
 
-static unsigned long calc_memmap_size(unsigned long spanned_pages,
-                                     unsigned long present_pages)
+static unsigned long __paginginit calc_memmap_size(unsigned long spanned_pages,
+                                                  unsigned long present_pages)
 {
        unsigned long pages = spanned_pages;