lkml.org 
[lkml]   [2007]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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>

    --

    mm/page_alloc.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index bd8e335..12dc471 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -1953,8 +1953,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++) {
    @@ -2431,7 +2431,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)
    {
    @@ -2519,7 +2519,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)
    {
    @@ -2536,14 +2536,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 linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-06-18 07:01    [W:0.028 / U:152.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site