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

11 files changed, 12 insertions, 16 deletions

diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 08d80f2f51f2..6d048490c559 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1333,7 +1333,7 @@ int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq,
         dma_kmem = kmem_cache_create("dma_desc",
                                      sizeof(struct s3c2410_dma_buf), 0,
                                      SLAB_HWCACHE_ALIGN,
-                                     s3c2410_dma_cache_ctor, NULL);
+                                     s3c2410_dma_cache_ctor);
 
         if (dma_kmem == NULL) {
                 printk(KERN_ERR "dma failed to make kmem cache\n");
diff --git a/arch/arm26/mm/memc.c b/arch/arm26/mm/memc.c
index 42505541a9b1..ffecd8578247 100644
--- a/arch/arm26/mm/memc.c
+++ b/arch/arm26/mm/memc.c
@@ -176,9 +176,9 @@ void __init pgtable_cache_init(void)
 {
         pte_cache = kmem_cache_create("pte-cache",
                                 sizeof(pte_t) * PTRS_PER_PTE,
-                                0, SLAB_PANIC, pte_cache_ctor, NULL);
+                                0, SLAB_PANIC, pte_cache_ctor);
 
         pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
                                 sizeof(pgd_t) * PTRS_PER_PGD,
-                                0, SLAB_PANIC, pgd_cache_ctor, NULL);
+                                0, SLAB_PANIC, pgd_cache_ctor);
 }
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 6a68b1ae061c..6e72f22e6bbd 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -752,8 +752,7 @@ void __init pgtable_cache_init(void)
                                         PTRS_PER_PMD*sizeof(pmd_t),
                                         PTRS_PER_PMD*sizeof(pmd_t),
                                         SLAB_PANIC,
-                                        pmd_ctor,
-                                        NULL);
+                                        pmd_ctor);
                 if (!SHARED_KERNEL_PMD) {
                         /* If we're in PAE mode and have a non-shared
                            kernel pmd, then the pgd size must be a
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index beea7a0b9dc6..e13a1a1db4b5 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -253,7 +253,7 @@ ia32_init (void)
 
                 partial_page_cachep = kmem_cache_create("partial_page_cache",
                                                 sizeof(struct partial_page),
-                                                0, SLAB_PANIC, NULL, NULL);
+                                                0, SLAB_PANIC, NULL);
         }
 #endif
         return 0;
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index f72118c0844f..62b7bf2f3eab 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -804,7 +804,7 @@ int __init rtas_flash_init(void)
 
         flash_block_cache = kmem_cache_create("rtas_flash_cache",
                                 RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-                                rtas_block_ctor, NULL);
+                                rtas_block_ctor);
         if (!flash_block_cache) {
                 printk(KERN_ERR "%s: failed to create block cache\n",
                                 __FUNCTION__);
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 92a1b16fb7e3..4835f73af304 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -542,7 +542,7 @@ static int __init hugetlbpage_init(void)
                                                HUGEPTE_TABLE_SIZE,
                                                HUGEPTE_TABLE_SIZE,
                                                0,
-                                               zero_ctor, NULL);
+                                               zero_ctor);
         if (! huge_pgtable_cache)
                 panic("hugetlbpage_init(): could not create hugepte cache\n");
 
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 1d6edf724c85..9f27bb56a61d 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -178,7 +178,6 @@ void pgtable_cache_init(void)
                 pgtable_cache[i] = kmem_cache_create(name,
                                                      size, size,
                                                      SLAB_PANIC,
-                                                     zero_ctor,
-                                                     NULL);
+                                                     zero_ctor);
         }
 }
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index f37460e5bfd2..7eb4d6cbcb74 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -654,7 +654,7 @@ static int __init spufs_init(void)
         ret = -ENOMEM;
         spufs_inode_cache = kmem_cache_create("spufs_inode_cache",
                         sizeof(struct spufs_inode_info), 0,
-                        SLAB_HWCACHE_ALIGN, spufs_init_once, NULL);
+                        SLAB_HWCACHE_ALIGN, spufs_init_once);
 
         if (!spufs_inode_cache)
                 goto out;
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index d7fff752e569..b98d6c3e6f36 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -371,8 +371,7 @@ static int __init sq_api_init(void)
         printk(KERN_NOTICE "sq: Registering store queue API.\n");
 
         sq_cache = kmem_cache_create("store_queue_cache",
-                                sizeof(struct sq_mapping), 0, 0,
-                                NULL, NULL);
+                                sizeof(struct sq_mapping), 0, 0, NULL);
         if (unlikely(!sq_cache))
                 return ret;
 
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index b6a5a338145b..a08a4a958add 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -310,7 +310,7 @@ static int __init pmb_init(void)
         BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
 
         pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
-                                      SLAB_PANIC, pmb_cache_ctor, NULL);
+                                      SLAB_PANIC, pmb_cache_ctor);
 
         jump_to_P2();
 
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 8eb8a7c76ec9..7ff0a02f5813 100644
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -262,8 +262,7 @@ void __init pgtable_cache_init(void)
 
                 tsb_caches[i] = kmem_cache_create(name,
                                                   size, size,
-                                                  0,
-                                                  NULL, NULL);
+                                                  0, NULL);
                 if (!tsb_caches[i]) {
                         prom_printf("Could not create %s cache\n", name);
                         prom_halt();