diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /mm/vmalloc.c | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
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 | { |