diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /mm/slab.c | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'mm/slab.c')
-rw-r--r-- | mm/slab.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -878,7 +878,7 @@ static struct array_cache *alloc_arraycache(int node, int entries, | |||
878 | nc = kmalloc_node(memsize, gfp, node); | 878 | nc = kmalloc_node(memsize, gfp, node); |
879 | /* | 879 | /* |
880 | * The array_cache structures contain pointers to free object. | 880 | * The array_cache structures contain pointers to free object. |
881 | * However, when such objects are allocated or transfered to another | 881 | * However, when such objects are allocated or transferred to another |
882 | * cache the pointers are not cleared and they could be counted as | 882 | * cache the pointers are not cleared and they could be counted as |
883 | * valid references during a kmemleak scan. Therefore, kmemleak must | 883 | * valid references during a kmemleak scan. Therefore, kmemleak must |
884 | * not scan such objects. | 884 | * not scan such objects. |
@@ -2606,7 +2606,7 @@ EXPORT_SYMBOL(kmem_cache_shrink); | |||
2606 | * | 2606 | * |
2607 | * The cache must be empty before calling this function. | 2607 | * The cache must be empty before calling this function. |
2608 | * | 2608 | * |
2609 | * The caller must guarantee that noone will allocate memory from the cache | 2609 | * The caller must guarantee that no one will allocate memory from the cache |
2610 | * during the kmem_cache_destroy(). | 2610 | * during the kmem_cache_destroy(). |
2611 | */ | 2611 | */ |
2612 | void kmem_cache_destroy(struct kmem_cache *cachep) | 2612 | void kmem_cache_destroy(struct kmem_cache *cachep) |