|
@@ -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;
|
|
|
|