diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 19:38:21 -0400 |
| commit | e1e302d8a9ab06ba8d7d5ec503d8996e6cf0eca4 (patch) | |
| tree | 6a6c805fdfd6a2f6433956cbee348b2c3a277784 /mm/vmalloc.c | |
| parent | 944ac4259e39801c843a915c3da8194ac9af0440 (diff) | |
| parent | 7f82f000ed030d1108b4de47d9e2d556092980c6 (diff) | |
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 036536945dd9..f1cc03bbf6ac 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -897,7 +897,8 @@ EXPORT_SYMBOL(vm_unmap_ram); | |||
| 897 | * @count: number of pages | 897 | * @count: number of pages |
| 898 | * @node: prefer to allocate data structures on this node | 898 | * @node: prefer to allocate data structures on this node |
| 899 | * @prot: memory protection to use. PAGE_KERNEL for regular RAM | 899 | * @prot: memory protection to use. PAGE_KERNEL for regular RAM |
| 900 | * @returns: a pointer to the address that has been mapped, or NULL on failure | 900 | * |
| 901 | * Returns: a pointer to the address that has been mapped, or %NULL on failure | ||
| 901 | */ | 902 | */ |
| 902 | void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot) | 903 | void *vm_map_ram(struct page **pages, unsigned int count, int node, pgprot_t prot) |
| 903 | { | 904 | { |