aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-16 02:38:20 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:36 -0400
commit6ea6e6887dad1fd44e6d5020a0fd355af4f2b6b3 (patch)
tree184e6c217acd1013b60f439bb7cb8b400525ca43 /mm
parent8f0accc8627043702e6ea2bb8b9aa3a171ef8393 (diff)
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: Paul Mundt <lethal@linux-sh.org> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0161cb6a56d9..fe5ea6b7b7f5 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2182,8 +2182,8 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
2182 } 2182 }
2183} 2183}
2184 2184
2185void zone_init_free_lists(struct pglist_data *pgdat, struct zone *zone, 2185static void __meminit zone_init_free_lists(struct pglist_data *pgdat,
2186 unsigned long size) 2186 struct zone *zone, unsigned long size)
2187{ 2187{
2188 int order; 2188 int order;
2189 for (order = 0; order < MAX_ORDER ; order++) { 2189 for (order = 0; order < MAX_ORDER ; order++) {
@@ -2660,7 +2660,7 @@ void __meminit get_pfn_range_for_nid(unsigned int nid,
2660 * Return the number of pages a zone spans in a node, including holes 2660 * Return the number of pages a zone spans in a node, including holes
2661 * present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node() 2661 * present_pages = zone_spanned_pages_in_node() - zone_absent_pages_in_node()
2662 */ 2662 */
2663unsigned long __meminit zone_spanned_pages_in_node(int nid, 2663static unsigned long __meminit zone_spanned_pages_in_node(int nid,
2664 unsigned long zone_type, 2664 unsigned long zone_type,
2665 unsigned long *ignored) 2665 unsigned long *ignored)
2666{ 2666{
@@ -2748,7 +2748,7 @@ unsigned long __init absent_pages_in_range(unsigned long start_pfn,
2748} 2748}
2749 2749
2750/* Return the number of page frames in holes in a zone on a node */ 2750/* Return the number of page frames in holes in a zone on a node */
2751unsigned long __meminit zone_absent_pages_in_node(int nid, 2751static unsigned long __meminit zone_absent_pages_in_node(int nid,
2752 unsigned long zone_type, 2752 unsigned long zone_type,
2753 unsigned long *ignored) 2753 unsigned long *ignored)
2754{ 2754{
@@ -2765,14 +2765,14 @@ unsigned long __meminit zone_absent_pages_in_node(int nid,
2765} 2765}
2766 2766
2767#else 2767#else
2768static inline unsigned long zone_spanned_pages_in_node(int nid, 2768static inline unsigned long __meminit zone_spanned_pages_in_node(int nid,
2769 unsigned long zone_type, 2769 unsigned long zone_type,
2770 unsigned long *zones_size) 2770 unsigned long *zones_size)
2771{ 2771{
2772 return zones_size[zone_type]; 2772 return zones_size[zone_type];
2773} 2773}
2774 2774
2775static inline unsigned long zone_absent_pages_in_node(int nid, 2775static inline unsigned long __meminit zone_absent_pages_in_node(int nid,
2776 unsigned long zone_type, 2776 unsigned long zone_type,
2777 unsigned long *zholes_size) 2777 unsigned long *zholes_size)
2778{ 2778{