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/lib/idr.c b/lib/idr.c
index 5ca67b3cfd35..ffd61941e75d 100644
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -590,7 +590,7 @@ static  int init_id_cache(void)
 {
         if (!idr_layer_cache)
                 idr_layer_cache = kmem_cache_create("idr_layer_cache",
-                        sizeof(struct idr_layer), 0, 0, idr_cache_ctor, NULL);
+                        sizeof(struct idr_layer), 0, 0, idr_cache_ctor);
         return 0;
 }
 
diff --git a/lib/radix-tree.c b/lib/radix-tree.c
index 9927cca14cb7..514efb200be6 100644
--- a/lib/radix-tree.c
+++ b/lib/radix-tree.c
@@ -1021,7 +1021,7 @@ void __init radix_tree_init(void)
 {
         radix_tree_node_cachep = kmem_cache_create("radix_tree_node",
                         sizeof(struct radix_tree_node), 0,
-                        SLAB_PANIC, radix_tree_node_ctor, NULL);
+                        SLAB_PANIC, radix_tree_node_ctor);
         radix_tree_init_maxindex();
         hotcpu_notifier(radix_tree_callback, 0);
 }