diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /mm/vmalloc.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 54a90e83cb31..729eb3eec75f 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -457,7 +457,7 @@ void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot) | |||
| 457 | * @size: allocation size | 457 | * @size: allocation size |
| 458 | * @gfp_mask: flags for the page level allocator | 458 | * @gfp_mask: flags for the page level allocator |
| 459 | * @prot: protection mask for the allocated pages | 459 | * @prot: protection mask for the allocated pages |
| 460 | * @node node to use for allocation or -1 | 460 | * @node: node to use for allocation or -1 |
| 461 | * | 461 | * |
| 462 | * Allocate enough pages to cover @size from the page level | 462 | * Allocate enough pages to cover @size from the page level |
| 463 | * allocator with @gfp_mask flags. Map them into contiguous | 463 | * allocator with @gfp_mask flags. Map them into contiguous |
| @@ -507,7 +507,7 @@ EXPORT_SYMBOL(vmalloc); | |||
| 507 | * vmalloc_node - allocate memory on a specific node | 507 | * vmalloc_node - allocate memory on a specific node |
| 508 | * | 508 | * |
| 509 | * @size: allocation size | 509 | * @size: allocation size |
| 510 | * @node; numa node | 510 | * @node: numa node |
| 511 | * | 511 | * |
| 512 | * Allocate enough pages to cover @size from the page level | 512 | * Allocate enough pages to cover @size from the page level |
| 513 | * allocator and map them into contiguous kernel virtual space. | 513 | * allocator and map them into contiguous kernel virtual space. |