diff --git a/[refs] b/[refs] index 0a44e108a020..28114f67df92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d07fe82c24daab2360e2790f488bcffa7db74825 +refs/heads/master: b8008b2bc21fb13b45964e21247f18c013d6e985 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 252972ff6495..21ba06035700 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3224,7 +3224,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags) EXPORT_SYMBOL(kmem_cache_alloc); /** - * kmem_cache_alloc - Allocate an object. The memory is set to zero. + * kmem_cache_zalloc - Allocate an object. The memory is set to zero. * @cache: The cache to allocate from. * @flags: See kmalloc(). *