lkml.org 
[lkml]   [2013]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 2/2] mm/vmalloc: drop "caller" argument of __vmalloc_area_node()
    Date
    __vmalloc_area_node() no longer need "caller" argument. It can use area->caller 
    instead. This patch drop "caller" argument of __vmalloc_area_node().

    Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
    ---
    mm/vmalloc.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/mm/vmalloc.c b/mm/vmalloc.c
    index d78d117..f75c2aa 100644
    --- a/mm/vmalloc.c
    +++ b/mm/vmalloc.c
    @@ -1546,7 +1546,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
    gfp_t gfp_mask, pgprot_t prot,
    int node, const void *caller);
    static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
    - pgprot_t prot, int node, const void *caller)
    + pgprot_t prot, int node)
    {
    const int order = 0;
    struct page **pages;
    @@ -1560,7 +1560,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
    /* Please note that the recursion is strictly bounded. */
    if (array_size > PAGE_SIZE) {
    pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
    - PAGE_KERNEL, node, caller);
    + PAGE_KERNEL, node, area->caller);
    area->flags |= VM_VPAGES;
    } else {
    pages = kmalloc_node(array_size, nested_gfp, node);
    @@ -1633,7 +1633,7 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
    if (!area)
    goto fail;

    - addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller);
    + addr = __vmalloc_area_node(area, gfp_mask, prot, node);
    if (!addr)
    goto fail;

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-09-18 03:01    [W:3.916 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site