diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
commit | 3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch) | |
tree | 2cd8a8d61f350aa3b00e6b0afc998544923f183e /mm/vmalloc.c | |
parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) |
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r-- | mm/vmalloc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 75f49d312e8c..4dd2636d0b92 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -1106,6 +1106,14 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, | |||
1106 | } | 1106 | } |
1107 | EXPORT_SYMBOL_GPL(__get_vm_area); | 1107 | EXPORT_SYMBOL_GPL(__get_vm_area); |
1108 | 1108 | ||
1109 | struct vm_struct *__get_vm_area_caller(unsigned long size, unsigned long flags, | ||
1110 | unsigned long start, unsigned long end, | ||
1111 | void *caller) | ||
1112 | { | ||
1113 | return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL, | ||
1114 | caller); | ||
1115 | } | ||
1116 | |||
1109 | /** | 1117 | /** |
1110 | * get_vm_area - reserve a contiguous kernel virtual area | 1118 | * get_vm_area - reserve a contiguous kernel virtual area |
1111 | * @size: size of the area | 1119 | * @size: size of the area |