Merge branch 'master' into upstream

[linux-2.6] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 4c28a421b270e54170a6d36f62a4ab5c85d33107..542394184a58e6c825a3b24cc7dfe1ad0e6e4fba 100644 (file)
--- 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);
 
@@ -339,7 +338,3 @@ void kmem_cache_init(void)
 
        mod_timer(&slob_timer, jiffies + HZ);
 }
-
-atomic_t slab_reclaim_pages = ATOMIC_INIT(0);
-EXPORT_SYMBOL(slab_reclaim_pages);
-