aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c6
-rw-r--r--mm/slob.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 7a48eb1a60c8..c52ebf9c4462 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2442,7 +2442,6 @@ EXPORT_SYMBOL(kmem_cache_shrink);
2442 * @cachep: the cache to destroy 2442 * @cachep: the cache to destroy
2443 * 2443 *
2444 * Remove a struct kmem_cache object from the slab cache. 2444 * Remove a struct kmem_cache object from the slab cache.
2445 * Returns 0 on success.
2446 * 2445 *
2447 * It is expected this function will be called by a module when it is 2446 * It is expected this function will be called by a module when it is
2448 * unloaded. This will remove the cache completely, and avoid a duplicate 2447 * unloaded. This will remove the cache completely, and avoid a duplicate
@@ -2454,7 +2453,7 @@ EXPORT_SYMBOL(kmem_cache_shrink);
2454 * The caller must guarantee that noone will allocate memory from the cache 2453 * The caller must guarantee that noone will allocate memory from the cache
2455 * during the kmem_cache_destroy(). 2454 * during the kmem_cache_destroy().
2456 */ 2455 */
2457int kmem_cache_destroy(struct kmem_cache *cachep) 2456void kmem_cache_destroy(struct kmem_cache *cachep)
2458{ 2457{
2459 BUG_ON(!cachep || in_interrupt()); 2458 BUG_ON(!cachep || in_interrupt());
2460 2459
@@ -2475,7 +2474,7 @@ int kmem_cache_destroy(struct kmem_cache *cachep)
2475 list_add(&cachep->next, &cache_chain); 2474 list_add(&cachep->next, &cache_chain);
2476 mutex_unlock(&cache_chain_mutex); 2475 mutex_unlock(&cache_chain_mutex);
2477 unlock_cpu_hotplug(); 2476 unlock_cpu_hotplug();
2478 return 1; 2477 return;
2479 } 2478 }
2480 2479
2481 if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) 2480 if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU))
@@ -2483,7 +2482,6 @@ int kmem_cache_destroy(struct kmem_cache *cachep)
2483 2482
2484 __kmem_cache_destroy(cachep); 2483 __kmem_cache_destroy(cachep);
2485 unlock_cpu_hotplug(); 2484 unlock_cpu_hotplug();
2486 return 0;
2487} 2485}
2488EXPORT_SYMBOL(kmem_cache_destroy); 2486EXPORT_SYMBOL(kmem_cache_destroy);
2489 2487
diff --git a/mm/slob.c b/mm/slob.c
index 20188627347c..542394184a58 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -270,10 +270,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
270} 270}
271EXPORT_SYMBOL(kmem_cache_create); 271EXPORT_SYMBOL(kmem_cache_create);
272 272
273int kmem_cache_destroy(struct kmem_cache *c) 273void kmem_cache_destroy(struct kmem_cache *c)
274{ 274{
275 slob_free(c, sizeof(struct kmem_cache)); 275 slob_free(c, sizeof(struct kmem_cache));
276 return 0;
277} 276}
278EXPORT_SYMBOL(kmem_cache_destroy); 277EXPORT_SYMBOL(kmem_cache_destroy);
279 278