Merge branch 'master' into upstream

1 files changed, 1 insertions, 2 deletions

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,
 }
 EXPORT_SYMBOL(kmem_cache_create);
 
-int kmem_cache_destroy(struct kmem_cache *c)
+void kmem_cache_destroy(struct kmem_cache *c)
 {
         slob_free(c, sizeof(struct kmem_cache));
-        return 0;
 }
 EXPORT_SYMBOL(kmem_cache_destroy);