diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:29:40 -0400 |
| commit | 5a54bd1307471c1cd0521402fe65e2057edcab2f (patch) | |
| tree | 25fb6a543db4ccc11b6d5662ed2e7facfce39ae7 /include/linux/vmalloc.h | |
| parent | f9f35677d81adb0feedcd6e0e661784805c8facd (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'v2.6.29' into core/header-fixes
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); |