Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3722e13c authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds
Browse files

mm/vmalloc: don't set area->caller twice 



The caller address has already been set in set_vmalloc_vm(), there's no
need to set it again in __vmalloc_area_node.

Reviewed-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: default avatarWanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 948927ee

mm/vmalloc.c

+3 −4
Original line number Diff line number Diff line
@@ -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,13 +1560,12 @@ 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);

	}

	area->pages = pages;

	area->caller = caller;

	if (!area->pages) {

		remove_vm_area(area->addr);

		kfree(area);
@@ -1634,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;