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, 4 insertions, 4 deletions

diff --git a/block/bsg.c b/block/bsg.c
index baa04e7adf19..f2992e72b841 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1043,7 +1043,7 @@ static int __init bsg_init(void)
         dev_t devid;
 
         bsg_cmd_cachep = kmem_cache_create("bsg_cmd",
-                                sizeof(struct bsg_command), 0, 0, NULL, NULL);
+                                sizeof(struct bsg_command), 0, 0, NULL);
         if (!bsg_cmd_cachep) {
                 printk(KERN_ERR "bsg: failed creating slab cache\n");
                 return -ENOMEM;
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index d7cadf304168..66056ca5e631 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3698,13 +3698,13 @@ int __init blk_dev_init(void)
                 panic("Failed to create kblockd\n");
 
         request_cachep = kmem_cache_create("blkdev_requests",
-                        sizeof(struct request), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(struct request), 0, SLAB_PANIC, NULL);
 
         requestq_cachep = kmem_cache_create("blkdev_queue",
-                        sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(request_queue_t), 0, SLAB_PANIC, NULL);
 
         iocontext_cachep = kmem_cache_create("blkdev_ioc",
-                        sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
+                        sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 
         for_each_possible_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));