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 /include/linux/vmalloc.h | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) | |
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 506e7620a986..9c0890c7a06a 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h | |||
| @@ -84,6 +84,10 @@ extern struct vm_struct *get_vm_area_caller(unsigned long size, | |||
| 84 | unsigned long flags, void *caller); | 84 | unsigned long flags, void *caller); |
| 85 | extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, | 85 | extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, |
| 86 | unsigned long start, unsigned long end); | 86 | unsigned long start, unsigned long end); |
| 87 | extern struct vm_struct *__get_vm_area_caller(unsigned long size, | ||
| 88 | unsigned long flags, | ||
| 89 | unsigned long start, unsigned long end, | ||
| 90 | void *caller); | ||
| 87 | extern struct vm_struct *get_vm_area_node(unsigned long size, | 91 | extern struct vm_struct *get_vm_area_node(unsigned long size, |
| 88 | unsigned long flags, int node, | 92 | unsigned long flags, int node, |
| 89 | gfp_t gfp_mask); | 93 | gfp_t gfp_mask); |
