Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6ea6e6887dad1fd44e6d5020a0fd355af4f2b6b3
Commit:     6ea6e6887dad1fd44e6d5020a0fd355af4f2b6b3
Parent:     8f0accc8627043702e6ea2bb8b9aa3a171ef8393
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:38:20 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:36 2007 -0700

    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 <[EMAIL PROTECTED]>
    Cc: Yasunori Goto <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 mm/page_alloc.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0161cb6..fe5ea6b 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,
        }
 }
 
-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)
 {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to