lkml.org 
[lkml]   [2009]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/25] Replace __alloc_pages_internal() with __alloc_pages_nodemask()
    Date
    __alloc_pages_internal is the core page allocator function but
    essentially it is an alias of __alloc_pages_nodemask. Naming a publicly
    available and exported function "internal" is also a big ugly. This
    patch renames __alloc_pages_internal() to __alloc_pages_nodemask() and
    deletes the old nodemask function.

    Warning - This patch renames an exported symbol. No kernel driver is
    affected by external drivers calling __alloc_pages_internal() should
    change the call to __alloc_pages_nodemask() without any alteration of
    parameters.

    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
    ---
    include/linux/gfp.h | 12 ++----------
    mm/page_alloc.c | 4 ++--
    2 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/include/linux/gfp.h b/include/linux/gfp.h
    index 0bbc15f..556c840 100644
    --- a/include/linux/gfp.h
    +++ b/include/linux/gfp.h
    @@ -169,24 +169,16 @@ static inline void arch_alloc_page(struct page *page, int order) { }
    #endif

    struct page *
    -__alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
    +__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, nodemask_t *nodemask);

    static inline struct page *
    __alloc_pages(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist)
    {
    - return __alloc_pages_internal(gfp_mask, order, zonelist, NULL);
    + return __alloc_pages_nodemask(gfp_mask, order, zonelist, NULL);
    }

    -static inline struct page *
    -__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    - struct zonelist *zonelist, nodemask_t *nodemask)
    -{
    - return __alloc_pages_internal(gfp_mask, order, zonelist, nodemask);
    -}
    -
    -
    static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
    unsigned int order)
    {
    diff --git a/mm/page_alloc.c b/mm/page_alloc.c
    index e4ea469..dcc4f05 100644
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -1462,7 +1462,7 @@ try_next_zone:
    * This is the 'heart' of the zoned buddy allocator.
    */
    struct page *
    -__alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
    +__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
    struct zonelist *zonelist, nodemask_t *nodemask)
    {
    const gfp_t wait = gfp_mask & __GFP_WAIT;
    @@ -1671,7 +1671,7 @@ nopage:
    got_pg:
    return page;
    }
    -EXPORT_SYMBOL(__alloc_pages_internal);
    +EXPORT_SYMBOL(__alloc_pages_nodemask);

    /*
    * Common helper functions.
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-04-21 00:25    [W:5.464 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site