diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /mm/percpu.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'mm/percpu.c')
-rw-r--r-- | mm/percpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 55d4d113fbd3..a160db39b810 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
@@ -342,7 +342,7 @@ static void pcpu_chunk_relocate(struct pcpu_chunk *chunk, int oslot) | |||
342 | * @chunk: chunk of interest | 342 | * @chunk: chunk of interest |
343 | * | 343 | * |
344 | * Determine whether area map of @chunk needs to be extended to | 344 | * Determine whether area map of @chunk needs to be extended to |
345 | * accomodate a new allocation. | 345 | * accommodate a new allocation. |
346 | * | 346 | * |
347 | * CONTEXT: | 347 | * CONTEXT: |
348 | * pcpu_lock. | 348 | * pcpu_lock. |
@@ -431,7 +431,7 @@ out_unlock: | |||
431 | * depending on @head, is reduced by @tail bytes and @tail byte block | 431 | * depending on @head, is reduced by @tail bytes and @tail byte block |
432 | * is inserted after the target block. | 432 | * is inserted after the target block. |
433 | * | 433 | * |
434 | * @chunk->map must have enough free slots to accomodate the split. | 434 | * @chunk->map must have enough free slots to accommodate the split. |
435 | * | 435 | * |
436 | * CONTEXT: | 436 | * CONTEXT: |
437 | * pcpu_lock. | 437 | * pcpu_lock. |
@@ -1435,7 +1435,7 @@ static struct pcpu_alloc_info * __init pcpu_build_alloc_info( | |||
1435 | /* | 1435 | /* |
1436 | * Determine min_unit_size, alloc_size and max_upa such that | 1436 | * Determine min_unit_size, alloc_size and max_upa such that |
1437 | * alloc_size is multiple of atom_size and is the smallest | 1437 | * alloc_size is multiple of atom_size and is the smallest |
1438 | * which can accomodate 4k aligned segments which are equal to | 1438 | * which can accommodate 4k aligned segments which are equal to |
1439 | * or larger than min_unit_size. | 1439 | * or larger than min_unit_size. |
1440 | */ | 1440 | */ |
1441 | min_unit_size = max_t(size_t, size_sum, PCPU_MIN_UNIT_SIZE); | 1441 | min_unit_size = max_t(size_t, size_sum, PCPU_MIN_UNIT_SIZE); |
@@ -1550,7 +1550,7 @@ static struct pcpu_alloc_info * __init pcpu_build_alloc_info( | |||
1550 | * @atom_size: allocation atom size | 1550 | * @atom_size: allocation atom size |
1551 | * @cpu_distance_fn: callback to determine distance between cpus, optional | 1551 | * @cpu_distance_fn: callback to determine distance between cpus, optional |
1552 | * @alloc_fn: function to allocate percpu page | 1552 | * @alloc_fn: function to allocate percpu page |
1553 | * @free_fn: funtion to free percpu page | 1553 | * @free_fn: function to free percpu page |
1554 | * | 1554 | * |
1555 | * This is a helper to ease setting up embedded first percpu chunk and | 1555 | * This is a helper to ease setting up embedded first percpu chunk and |
1556 | * can be called where pcpu_setup_first_chunk() is expected. | 1556 | * can be called where pcpu_setup_first_chunk() is expected. |
@@ -1678,7 +1678,7 @@ out_free: | |||
1678 | * pcpu_page_first_chunk - map the first chunk using PAGE_SIZE pages | 1678 | * pcpu_page_first_chunk - map the first chunk using PAGE_SIZE pages |
1679 | * @reserved_size: the size of reserved percpu area in bytes | 1679 | * @reserved_size: the size of reserved percpu area in bytes |
1680 | * @alloc_fn: function to allocate percpu page, always called with PAGE_SIZE | 1680 | * @alloc_fn: function to allocate percpu page, always called with PAGE_SIZE |
1681 | * @free_fn: funtion to free percpu page, always called with PAGE_SIZE | 1681 | * @free_fn: function to free percpu page, always called with PAGE_SIZE |
1682 | * @populate_pte_fn: function to populate pte | 1682 | * @populate_pte_fn: function to populate pte |
1683 | * | 1683 | * |
1684 | * This is a helper to ease setting up page-remapped first percpu | 1684 | * This is a helper to ease setting up page-remapped first percpu |