diff --git a/[refs] b/[refs] index 01869764b616..2541b9fae998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5045790589bd426b5d515d78fa71f0fc92dd4e83 +refs/heads/master: c85d194bfd2e36c5254b8058c1f35cfce0dfa10a diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 2a39cf128aba..6e45b0f3d125 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -547,6 +547,7 @@ void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot) * @gfp_mask: flags for the page level allocator * @prot: protection mask for the allocated pages * @node: node to use for allocation or -1 + * @caller: caller's return address * * Allocate enough pages to cover @size from the page level * allocator with @gfp_mask flags. Map them into contiguous