From 0d15a0823b97a9d41bb224f1bc1a184466664bf3 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 18 Feb 2009 14:48:12 -0800 Subject: [PATCH] --- yaml --- r: 131481 b: refs/heads/master c: c296861291669f305deef19b78042330d7135017 h: refs/heads/master i: 131479: f3c9794b10c091b1892134b2eb8efe95f4c8067e v: v3 --- [refs] | 2 +- trunk/include/linux/vmalloc.h | 4 ++++ trunk/mm/vmalloc.c | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e56359fc617b..0d65cb464a3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5955c7a2cfb6a35429adea5dc480002b15ca8cfc +refs/heads/master: c296861291669f305deef19b78042330d7135017 diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h index 506e7620a986..9c0890c7a06a 100644 --- a/trunk/include/linux/vmalloc.h +++ b/trunk/include/linux/vmalloc.h @@ -84,6 +84,10 @@ extern struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags, void *caller); extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, unsigned long start, unsigned long end); +extern struct vm_struct *__get_vm_area_caller(unsigned long size, + unsigned long flags, + unsigned long start, unsigned long end, + void *caller); extern struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags, int node, gfp_t gfp_mask); diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 75f49d312e8c..4dd2636d0b92 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -1106,6 +1106,14 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, } EXPORT_SYMBOL_GPL(__get_vm_area); +struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, + unsigned long start, unsigned long end, + void *caller) +{ + return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL, + caller); +} + /** * get_vm_area - reserve a contiguous kernel virtual area * @size: size of the area