Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
  mm: Remove slab destructors from kmem_cache_create().

1 files changed, 1 insertions, 2 deletions

diff --git a/mm/slob.c b/mm/slob.c
index c89ef116d7..d50920ecc0 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -492,8 +492,7 @@ struct kmem_cache {
 
 struct kmem_cache *kmem_cache_create(const char *name, size_t size,
         size_t align, unsigned long flags,
-        void (*ctor)(void*, struct kmem_cache *, unsigned long),
-        void (*dtor)(void*, struct kmem_cache *, unsigned long))
+        void (*ctor)(void*, struct kmem_cache *, unsigned long))
 {
         struct kmem_cache *c;