28 files changed, 37 insertions, 39 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2e7ba615d760..00d53c2fd1e8 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1098,7 +1098,7 @@ void acpi_os_release_lock(acpi_spinlock lockp, acpi_cpu_flags flags)
 acpi_status
 acpi_os_create_cache(char *name, u16 size, u16 depth, acpi_cache_t ** cache)
 {
-        *cache = kmem_cache_create(name, size, 0, 0, NULL, NULL);
+        *cache = kmem_cache_create(name, size, 0, 0, NULL);
         if (*cache == NULL)
                 return AE_ERROR;
         else
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index 478489c568a4..4f598270fa31 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -257,9 +257,9 @@ aoeblk_exit(void)
 int __init
 aoeblk_init(void)
 {
-        buf_pool_cache = kmem_cache_create("aoe_bufs", 
+        buf_pool_cache = kmem_cache_create("aoe_bufs",
                                            sizeof(struct buf),
-                                           0, 0, NULL, NULL);
+                                           0, 0, NULL);
         if (buf_pool_cache == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 93362eed94ed..3a9d7e2d4de6 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1729,7 +1729,7 @@ static int __init ether1394_init_module(void)
 
         packet_task_cache = kmem_cache_create("packet_task",
                                               sizeof(struct packet_task),
-                                              0, 0, NULL, NULL);
+                                              0, 0, NULL);
         if (!packet_task_cache)
                 return -ENOMEM;
 
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 6b8faca02f8a..bc547f1d34ba 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2998,7 +2998,6 @@ static int __init ib_mad_init_module(void)
                                          sizeof(struct ib_mad_private),
                                          0,
                                          SLAB_HWCACHE_ALIGN,
-                                         NULL,
                                          NULL);
         if (!ib_mad_cache) {
                 printk(KERN_ERR PFX "Couldn't create ib_mad cache\n");
diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/infiniband/hw/amso1100/c2_vq.c
index 36620a22413c..cfdacb1ec279 100644
--- a/drivers/infiniband/hw/amso1100/c2_vq.c
+++ b/drivers/infiniband/hw/amso1100/c2_vq.c
@@ -85,7 +85,7 @@ int vq_init(struct c2_dev *c2dev)
                 (char) ('0' + c2dev->devnum));
         c2dev->host_msg_cache =
             kmem_cache_create(c2dev->vq_cache_name, c2dev->rep_vq.msg_size, 0,
-                              SLAB_HWCACHE_ALIGN, NULL, NULL);
+                              SLAB_HWCACHE_ALIGN, NULL);
         if (c2dev->host_msg_cache == NULL) {
                 return -ENOMEM;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c
index e53a97af1260..97d108634c58 100644
--- a/drivers/infiniband/hw/ehca/ehca_av.c
+++ b/drivers/infiniband/hw/ehca/ehca_av.c
@@ -259,7 +259,7 @@ int ehca_init_av_cache(void)
         av_cache = kmem_cache_create("ehca_cache_av",
                                    sizeof(struct ehca_av), 0,
                                    SLAB_HWCACHE_ALIGN,
-                                   NULL, NULL);
+                                   NULL);
         if (!av_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 9e87883b561a..1e8ca3fca4aa 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -387,7 +387,7 @@ int ehca_init_cq_cache(void)
         cq_cache = kmem_cache_create("ehca_cache_cq",
                                      sizeof(struct ehca_cq), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!cq_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 36377c6db3d4..04c324330b7c 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -163,7 +163,7 @@ static int ehca_create_slab_caches(void)
         ctblk_cache = kmem_cache_create("ehca_cache_ctblk",
                                         EHCA_PAGESIZE, H_CB_ALIGNMENT,
                                         SLAB_HWCACHE_ALIGN,
-                                        NULL, NULL);
+                                        NULL);
         if (!ctblk_cache) {
                 ehca_gen_err("Cannot create ctblk SLAB cache.");
                 ehca_cleanup_mrmw_cache();
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index 6262c5462d50..9f4c9d46e8ef 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -1950,13 +1950,13 @@ int ehca_init_mrmw_cache(void)
         mr_cache = kmem_cache_create("ehca_cache_mr",
                                      sizeof(struct ehca_mr), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!mr_cache)
                 return -ENOMEM;
         mw_cache = kmem_cache_create("ehca_cache_mw",
                                      sizeof(struct ehca_mw), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!mw_cache) {
                 kmem_cache_destroy(mr_cache);
                 mr_cache = NULL;
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c
index 79d0591a8043..c85312ad292b 100644
--- a/drivers/infiniband/hw/ehca/ehca_pd.c
+++ b/drivers/infiniband/hw/ehca/ehca_pd.c
@@ -100,7 +100,7 @@ int ehca_init_pd_cache(void)
         pd_cache = kmem_cache_create("ehca_cache_pd",
                                      sizeof(struct ehca_pd), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!pd_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 48e9ceacd6fa..a3146e696c5d 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1760,7 +1760,7 @@ int ehca_init_qp_cache(void)
         qp_cache = kmem_cache_create("ehca_cache_qp",
                                      sizeof(struct ehca_qp), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     NULL, NULL);
+                                     NULL);
         if (!qp_cache)
                 return -ENOMEM;
         return 0;
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index effdee299b0c..5db314380271 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -637,7 +637,7 @@ static int __init iser_init(void)
         ig.desc_cache = kmem_cache_create("iser_descriptors",
                                           sizeof (struct iser_desc),
                                           0, SLAB_HWCACHE_ALIGN,
-                                          NULL, NULL);
+                                          NULL);
         if (ig.desc_cache == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index b297a6b111ac..1199d3f32ac3 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -1332,24 +1332,24 @@ int kvm_mmu_module_init(void)
 {
         pte_chain_cache = kmem_cache_create("kvm_pte_chain",
                                             sizeof(struct kvm_pte_chain),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!pte_chain_cache)
                 goto nomem;
         rmap_desc_cache = kmem_cache_create("kvm_rmap_desc",
                                             sizeof(struct kvm_rmap_desc),
-                                            0, 0, NULL, NULL);
+                                            0, 0, NULL);
         if (!rmap_desc_cache)
                 goto nomem;
 
         mmu_page_cache = kmem_cache_create("kvm_mmu_page",
                                            PAGE_SIZE,
-                                           PAGE_SIZE, 0, NULL, NULL);
+                                           PAGE_SIZE, 0, NULL);
         if (!mmu_page_cache)
                 goto nomem;
 
         mmu_page_header_cache = kmem_cache_create("kvm_mmu_page_header",
                                                   sizeof(struct kvm_mmu_page),
-                                                  0, 0, NULL, NULL);
+                                                  0, 0, NULL);
         if (!mmu_page_header_cache)
                 goto nomem;
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 0b66afef2d82..c8dfdb302916 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -951,7 +951,7 @@ static int grow_stripes(raid5_conf_t *conf, int num)
         conf->active_name = 0;
         sc = kmem_cache_create(conf->cache_name[conf->active_name],
                                sizeof(struct stripe_head)+(devs-1)*sizeof(struct r5dev),
-                               0, 0, NULL, NULL);
+                               0, 0, NULL);
         if (!sc)
                 return 1;
         conf->slab_cache = sc;
@@ -1003,7 +1003,7 @@ static int resize_stripes(raid5_conf_t *conf, int newsize)
         /* Step 1 */
         sc = kmem_cache_create(conf->cache_name[1-conf->active_name],
                                sizeof(struct stripe_head)+(newsize-1)*sizeof(struct r5dev),
-                               0, 0, NULL, NULL);
+                               0, 0, NULL);
         if (!sc)
                 return -ENOMEM;
 
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 64a52bd7544a..988c8ce47f58 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1171,8 +1171,7 @@ static int __init i2o_block_init(void)
         /* Allocate request mempool and slab */
         size = sizeof(struct i2o_block_request);
         i2o_blk_req_pool.slab = kmem_cache_create("i2o_block_req", size, 0,
-                                                  SLAB_HWCACHE_ALIGN, NULL,
-                                                  NULL);
+                                                  SLAB_HWCACHE_ALIGN, NULL);
         if (!i2o_blk_req_pool.slab) {
                 osm_err("can't init request slab\n");
                 rc = -ENOMEM;
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index 8aff9385613f..7c5e29eaf118 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1149,7 +1149,7 @@ int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
         if (ubi_devices_cnt == 0) {
                 ltree_slab = kmem_cache_create("ubi_ltree_slab",
                                                sizeof(struct ltree_entry), 0,
-                                               0, &ltree_entry_ctor, NULL);
+                                               0, &ltree_entry_ctor);
                 if (!ltree_slab)
                         return -ENOMEM;
         }
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 9de953762097..a5a9b8d87302 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1452,7 +1452,7 @@ int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_scan_info *si)
         if (ubi_devices_cnt == 0) {
                 wl_entries_slab = kmem_cache_create("ubi_wl_entry_slab",
                                                     sizeof(struct ubi_wl_entry),
-                                                    0, 0, NULL, NULL);
+                                                    0, 0, NULL);
                 if (!wl_entries_slab)
                         return -ENOMEM;
         }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 6a89cefe99bb..0c67258fb9ec 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -291,7 +291,7 @@ dasd_parse_keyword( char *parsestring ) {
                 dasd_page_cache =
                         kmem_cache_create("dasd_page_cache", PAGE_SIZE,
                                           PAGE_SIZE, SLAB_CACHE_DMA,
-                                          NULL, NULL );
+                                          NULL);
                 if (!dasd_page_cache)
                         MESSAGE(KERN_WARNING, "%s", "Failed to create slab, "
                                 "fixed buffer mode disabled.");
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index a1db95925138..9726261c367d 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -259,21 +259,21 @@ zfcp_module_init(void)
         size = sizeof(struct zfcp_fsf_req_qtcb);
         align = calc_alignment(size);
         zfcp_data.fsf_req_qtcb_cache =
-                kmem_cache_create("zfcp_fsf", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_fsf", size, align, 0, NULL);
         if (!zfcp_data.fsf_req_qtcb_cache)
                 goto out;
 
         size = sizeof(struct fsf_status_read_buffer);
         align = calc_alignment(size);
         zfcp_data.sr_buffer_cache =
-                kmem_cache_create("zfcp_sr", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_sr", size, align, 0, NULL);
         if (!zfcp_data.sr_buffer_cache)
                 goto out_sr_cache;
 
         size = sizeof(struct zfcp_gid_pn_data);
         align = calc_alignment(size);
         zfcp_data.gid_pn_cache =
-                kmem_cache_create("zfcp_gid", size, align, 0, NULL, NULL);
+                kmem_cache_create("zfcp_gid", size, align, 0, NULL);
         if (!zfcp_data.gid_pn_cache)
                 goto out_gid_cache;
 
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 1c0d7578e791..b8c6810090d5 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -462,7 +462,7 @@ static int asd_create_global_caches(void)
                                             sizeof(struct asd_dma_tok),
                                             0,
                                             SLAB_HWCACHE_ALIGN,
-                                            NULL, NULL);
+                                            NULL);
                 if (!asd_dma_token_cache) {
                         asd_printk("couldn't create dma token cache\n");
                         return -ENOMEM;
@@ -474,7 +474,7 @@ static int asd_create_global_caches(void)
                                                    sizeof(struct asd_ascb),
                                                    0,
                                                    SLAB_HWCACHE_ALIGN,
-                                                   NULL, NULL);
+                                                   NULL);
                 if (!asd_ascb_cache) {
                         asd_printk("couldn't create ascb cache\n");
                         goto Err;
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 965698c8b7bf..1396c83b0c9c 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(sas_domain_release_transport);
 static int __init sas_class_init(void)
 {
         sas_task_cache = kmem_cache_create("sas_task", sizeof(struct sas_task),
-                                           0, SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                           0, SLAB_HWCACHE_ALIGN, NULL);
         if (!sas_task_cache)
                 return -ENOMEM;
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index b5a77b0c0deb..92376f9dfdd5 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2723,7 +2723,7 @@ qla2x00_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
-            SLAB_HWCACHE_ALIGN, NULL, NULL);
+            SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                     "qla2xxx: Unable to allocate SRB cache...Failing load!\n");
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index e69160a7bc60..b1d565c12c5b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1677,7 +1677,7 @@ static int __init qla4xxx_module_init(void)
 
         /* Allocate cache for SRBs. */
         srb_cachep = kmem_cache_create("qla4xxx_srbs", sizeof(struct srb), 0,
-                                       SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                       SLAB_HWCACHE_ALIGN, NULL);
         if (srb_cachep == NULL) {
                 printk(KERN_ERR
                        "%s: Unable to allocate SRB cache..."
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index a691dda40d2c..a5de1a829a76 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -288,7 +288,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
         if (!pool->users) {
                 pool->slab = kmem_cache_create(pool->name,
                                 sizeof(struct scsi_cmnd), 0,
-                                pool->slab_flags, NULL, NULL);
+                                pool->slab_flags, NULL);
                 if (!pool->slab)
                         goto fail;
         }
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 1f5a07bf2a75..da63c544919b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1661,7 +1661,7 @@ int __init scsi_init_queue(void)
 
         scsi_io_context_cache = kmem_cache_create("scsi_io_context",
                                         sizeof(struct scsi_io_context),
-                                        0, 0, NULL, NULL);
+                                        0, 0, NULL);
         if (!scsi_io_context_cache) {
                 printk(KERN_ERR "SCSI: can't init scsi io context cache\n");
                 return -ENOMEM;
@@ -1672,7 +1672,7 @@ int __init scsi_init_queue(void)
                 int size = sgp->size * sizeof(struct scatterlist);
 
                 sgp->slab = kmem_cache_create(sgp->name, size, 0,
-                                SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                SLAB_HWCACHE_ALIGN, NULL);
                 if (!sgp->slab) {
                         printk(KERN_ERR "SCSI: can't init sg slab %s\n",
                                         sgp->name);
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 2570f48a69c7..371b69c110bc 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -585,7 +585,7 @@ static int __init scsi_tgt_init(void)
 
         scsi_tgt_cmd_cache = kmem_cache_create("scsi_tgt_cmd",
                                                sizeof(struct scsi_tgt_cmd),
-                                               0, 0, NULL, NULL);
+                                               0, 0, NULL);
         if (!scsi_tgt_cmd_cache)
                 return -ENOMEM;
 
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 76c555a67dac..805e5fc5f5db 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -933,7 +933,7 @@ static int __init uhci_hcd_init(void)
         }
 
         uhci_up_cachep = kmem_cache_create("uhci_urb_priv",
-                sizeof(struct urb_priv), 0, 0, NULL, NULL);
+                sizeof(struct urb_priv), 0, 0, NULL);
         if (!uhci_up_cachep)
                 goto up_failed;
 
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c
index 982b773d71e6..8f27a9e1c36b 100644
--- a/drivers/usb/mon/mon_text.c
+++ b/drivers/usb/mon/mon_text.c
@@ -340,7 +340,7 @@ static int mon_text_open(struct inode *inode, struct file *file)
         snprintf(rp->slab_name, SLAB_NAME_SZ, "mon_text_%p", rp);
         rp->e_slab = kmem_cache_create(rp->slab_name,
             sizeof(struct mon_event_text), sizeof(long), 0,
-            mon_text_ctor, NULL);
+            mon_text_ctor);
         if (rp->e_slab == NULL) {
                 rc = -ENOMEM;
                 goto err_slab;