Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ea6e688 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

mm: more __meminit annotations 



Currently zone_spanned_pages_in_node() and zone_absent_pages_in_node() are
non-static for ARCH_POPULATES_NODE_MAP and static otherwise.  However, only
the non-static versions are __meminit annotated, despite only being called
from __meminit functions in either case.

zone_init_free_lists() is currently non-static and not __meminit annotated
either, despite only being called once in the entire tree by
init_currently_empty_zone(), which too is __meminit.  So make it static and
properly annotated.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8f0accc8

mm/page_alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -2182,8 +2182,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, 
	}

}



void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone,

				unsigned long size)

static void __meminit zone_init_free_lists(struct pglist_data *pgdat,

				struct zone *zone, unsigned long size)

{

	int order;

	for (order = 0; order < MAX_ORDER ; order++) {
@@ -2660,7 +2660,7 @@ void __meminit get_pfn_range_for_nid(unsigned int nid, 
 * Return the number of pages a zone spans in a node, including holes

 * present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node()

 */

unsigned long __meminit zone_spanned_pages_in_node(int nid,

static unsigned long __meminit zone_spanned_pages_in_node(int nid,

					unsigned long zone_type,

					unsigned long *ignored)

{
@@ -2748,7 +2748,7 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn, 
}



/* Return the number of page frames in holes in a zone on a node */

unsigned long __meminit zone_absent_pages_in_node(int nid,

static unsigned long __meminit zone_absent_pages_in_node(int nid,

					unsigned long zone_type,

					unsigned long *ignored)

{
@@ -2765,14 +2765,14 @@ unsigned long __meminit zone_absent_pages_in_node(int nid, 
}



#else

static inline unsigned long zone_spanned_pages_in_node(int nid,

static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,

					unsigned long zone_type,

					unsigned long *zones_size)

{

	return zones_size[zone_type];

}



static inline unsigned long zone_absent_pages_in_node(int nid,

static inline unsigned long __meminit zone_absent_pages_in_node(int nid,

						unsigned long zone_type,

						unsigned long *zholes_size)

{