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().

2 files changed, 2 insertions, 2 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 82622fb6f68f..f2a61ef2af9c 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1770,7 +1770,7 @@ void __init dn_route_init(void)
 
         dn_dst_ops.kmem_cachep =
                 kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,
-                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
         init_timer(&dn_route_timer);
         dn_route_timer.function = dn_dst_check_expire;
         dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index d6615c9361e9..fda0772fa215 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -881,7 +881,7 @@ void __init dn_fib_table_init(void)
         dn_hash_kmem = kmem_cache_create("dn_fib_info_cache",
                                         sizeof(struct dn_fib_info),
                                         0, SLAB_HWCACHE_ALIGN,
-                                        NULL, NULL);
+                                        NULL);
 }
 
 void __exit dn_fib_table_cleanup(void)