diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
commit | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch) | |
tree | 415c4453d2b17a50abe7a3e515177e1fa337bd67 /arch | |
parent | 64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff) |
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.
This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 2 | ||||
-rw-r--r-- | arch/arm26/mm/memc.c | 4 | ||||
-rw-r--r-- | arch/i386/mm/init.c | 3 | ||||
-rw-r--r-- | arch/ia64/ia32/ia32_support.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas_flash.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 2 | ||||
-rw-r--r-- | arch/powerpc/mm/init_64.c | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 3 | ||||
-rw-r--r-- | arch/sh/mm/pmb.c | 2 | ||||
-rw-r--r-- | arch/sparc64/mm/tsb.c | 3 |
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, | |||
1333 | dma_kmem = kmem_cache_create("dma_desc", | 1333 | dma_kmem = kmem_cache_create("dma_desc", |
1334 | sizeof(struct s3c2410_dma_buf), 0, | 1334 | sizeof(struct s3c2410_dma_buf), 0, |
1335 | SLAB_HWCACHE_ALIGN, | 1335 | SLAB_HWCACHE_ALIGN, |
1336 | s3c2410_dma_cache_ctor, NULL); | 1336 | s3c2410_dma_cache_ctor); |
1337 | 1337 | ||
1338 | if (dma_kmem == NULL) { | 1338 | if (dma_kmem == NULL) { |
1339 | printk(KERN_ERR "dma failed to make kmem cache\n"); | 1339 | 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) | |||
176 | { | 176 | { |
177 | pte_cache = kmem_cache_create("pte-cache", | 177 | pte_cache = kmem_cache_create("pte-cache", |
178 | sizeof(pte_t) * PTRS_PER_PTE, | 178 | sizeof(pte_t) * PTRS_PER_PTE, |
179 | 0, SLAB_PANIC, pte_cache_ctor, NULL); | 179 | 0, SLAB_PANIC, pte_cache_ctor); |
180 | 180 | ||
181 | pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE + | 181 | pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE + |
182 | sizeof(pgd_t) * PTRS_PER_PGD, | 182 | sizeof(pgd_t) * PTRS_PER_PGD, |
183 | 0, SLAB_PANIC, pgd_cache_ctor, NULL); | 183 | 0, SLAB_PANIC, pgd_cache_ctor); |
184 | } | 184 | } |
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) | |||
752 | PTRS_PER_PMD*sizeof(pmd_t), | 752 | PTRS_PER_PMD*sizeof(pmd_t), |
753 | PTRS_PER_PMD*sizeof(pmd_t), | 753 | PTRS_PER_PMD*sizeof(pmd_t), |
754 | SLAB_PANIC, | 754 | SLAB_PANIC, |
755 | pmd_ctor, | 755 | pmd_ctor); |
756 | NULL); | ||
757 | if (!SHARED_KERNEL_PMD) { | 756 | if (!SHARED_KERNEL_PMD) { |
758 | /* If we're in PAE mode and have a non-shared | 757 | /* If we're in PAE mode and have a non-shared |
759 | kernel pmd, then the pgd size must be a | 758 | 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) | |||
253 | 253 | ||
254 | partial_page_cachep = kmem_cache_create("partial_page_cache", | 254 | partial_page_cachep = kmem_cache_create("partial_page_cache", |
255 | sizeof(struct partial_page), | 255 | sizeof(struct partial_page), |
256 | 0, SLAB_PANIC, NULL, NULL); | 256 | 0, SLAB_PANIC, NULL); |
257 | } | 257 | } |
258 | #endif | 258 | #endif |
259 | return 0; | 259 | 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) | |||
804 | 804 | ||
805 | flash_block_cache = kmem_cache_create("rtas_flash_cache", | 805 | flash_block_cache = kmem_cache_create("rtas_flash_cache", |
806 | RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0, | 806 | RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0, |
807 | rtas_block_ctor, NULL); | 807 | rtas_block_ctor); |
808 | if (!flash_block_cache) { | 808 | if (!flash_block_cache) { |
809 | printk(KERN_ERR "%s: failed to create block cache\n", | 809 | printk(KERN_ERR "%s: failed to create block cache\n", |
810 | __FUNCTION__); | 810 | __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) | |||
542 | HUGEPTE_TABLE_SIZE, | 542 | HUGEPTE_TABLE_SIZE, |
543 | HUGEPTE_TABLE_SIZE, | 543 | HUGEPTE_TABLE_SIZE, |
544 | 0, | 544 | 0, |
545 | zero_ctor, NULL); | 545 | zero_ctor); |
546 | if (! huge_pgtable_cache) | 546 | if (! huge_pgtable_cache) |
547 | panic("hugetlbpage_init(): could not create hugepte cache\n"); | 547 | panic("hugetlbpage_init(): could not create hugepte cache\n"); |
548 | 548 | ||
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) | |||
178 | pgtable_cache[i] = kmem_cache_create(name, | 178 | pgtable_cache[i] = kmem_cache_create(name, |
179 | size, size, | 179 | size, size, |
180 | SLAB_PANIC, | 180 | SLAB_PANIC, |
181 | zero_ctor, | 181 | zero_ctor); |
182 | NULL); | ||
183 | } | 182 | } |
184 | } | 183 | } |
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) | |||
654 | ret = -ENOMEM; | 654 | ret = -ENOMEM; |
655 | spufs_inode_cache = kmem_cache_create("spufs_inode_cache", | 655 | spufs_inode_cache = kmem_cache_create("spufs_inode_cache", |
656 | sizeof(struct spufs_inode_info), 0, | 656 | sizeof(struct spufs_inode_info), 0, |
657 | SLAB_HWCACHE_ALIGN, spufs_init_once, NULL); | 657 | SLAB_HWCACHE_ALIGN, spufs_init_once); |
658 | 658 | ||
659 | if (!spufs_inode_cache) | 659 | if (!spufs_inode_cache) |
660 | goto out; | 660 | 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) | |||
371 | printk(KERN_NOTICE "sq: Registering store queue API.\n"); | 371 | printk(KERN_NOTICE "sq: Registering store queue API.\n"); |
372 | 372 | ||
373 | sq_cache = kmem_cache_create("store_queue_cache", | 373 | sq_cache = kmem_cache_create("store_queue_cache", |
374 | sizeof(struct sq_mapping), 0, 0, | 374 | sizeof(struct sq_mapping), 0, 0, NULL); |
375 | NULL, NULL); | ||
376 | if (unlikely(!sq_cache)) | 375 | if (unlikely(!sq_cache)) |
377 | return ret; | 376 | return ret; |
378 | 377 | ||
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) | |||
310 | BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES)); | 310 | BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES)); |
311 | 311 | ||
312 | pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0, | 312 | pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0, |
313 | SLAB_PANIC, pmb_cache_ctor, NULL); | 313 | SLAB_PANIC, pmb_cache_ctor); |
314 | 314 | ||
315 | jump_to_P2(); | 315 | jump_to_P2(); |
316 | 316 | ||
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) | |||
262 | 262 | ||
263 | tsb_caches[i] = kmem_cache_create(name, | 263 | tsb_caches[i] = kmem_cache_create(name, |
264 | size, size, | 264 | size, size, |
265 | 0, | 265 | 0, NULL); |
266 | NULL, NULL); | ||
267 | if (!tsb_caches[i]) { | 266 | if (!tsb_caches[i]) { |
268 | prom_printf("Could not create %s cache\n", name); | 267 | prom_printf("Could not create %s cache\n", name); |
269 | prom_halt(); | 268 | prom_halt(); |