aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2007-05-08 03:23:13 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:14:57 -0400
commit0e6b9c98be1b517bf99a21d8a7036a8a21e47dd1 (patch)
treed38264506008361717a737581c26f7d3de28284b
parent72280ede316911fd5a82ef78d12a6705b1007d36 (diff)
use SLAB_PANIC flag cleanup
Use SLAB_PANIC and delete duplicated panic(). Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Ian Molton <spyro@f2s.com> Cc: David Howells <dhowells@redhat.com> Cc: Andi Kleen <ak@suse.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm26/mm/memc.c8
-rw-r--r--arch/frv/mm/pgalloc.c4
-rw-r--r--arch/i386/mm/init.c9
-rw-r--r--arch/ia64/ia32/ia32_support.c6
-rw-r--r--arch/powerpc/mm/init_64.c5
-rw-r--r--arch/sh/mm/pmb.c6
6 files changed, 11 insertions, 27 deletions
diff --git a/arch/arm26/mm/memc.c b/arch/arm26/mm/memc.c
index f2901581d4da..42505541a9b1 100644
--- a/arch/arm26/mm/memc.c
+++ b/arch/arm26/mm/memc.c
@@ -176,13 +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, 0, pte_cache_ctor, NULL); 179 0, SLAB_PANIC, pte_cache_ctor, NULL);
180 if (!pte_cache)
181 BUG();
182 180
183 pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE + 181 pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
184 sizeof(pgd_t) * PTRS_PER_PGD, 182 sizeof(pgd_t) * PTRS_PER_PGD,
185 0, 0, pgd_cache_ctor, NULL); 183 0, SLAB_PANIC, pgd_cache_ctor, NULL);
186 if (!pgd_cache)
187 BUG();
188} 184}
diff --git a/arch/frv/mm/pgalloc.c b/arch/frv/mm/pgalloc.c
index 19b13be114a2..598a26ab8ad8 100644
--- a/arch/frv/mm/pgalloc.c
+++ b/arch/frv/mm/pgalloc.c
@@ -151,9 +151,7 @@ void __init pgtable_cache_init(void)
151 pgd_cache = kmem_cache_create("pgd", 151 pgd_cache = kmem_cache_create("pgd",
152 PTRS_PER_PGD * sizeof(pgd_t), 152 PTRS_PER_PGD * sizeof(pgd_t),
153 PTRS_PER_PGD * sizeof(pgd_t), 153 PTRS_PER_PGD * sizeof(pgd_t),
154 0, 154 SLAB_PANIC,
155 pgd_ctor, 155 pgd_ctor,
156 pgd_dtor); 156 pgd_dtor);
157 if (!pgd_cache)
158 panic("pgtable_cache_init(): Cannot create pgd cache");
159} 157}
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 1a7197e89eb4..c50782efa5c3 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -751,12 +751,9 @@ void __init pgtable_cache_init(void)
751 pmd_cache = kmem_cache_create("pmd", 751 pmd_cache = kmem_cache_create("pmd",
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 0, 754 SLAB_PANIC,
755 pmd_ctor, 755 pmd_ctor,
756 NULL); 756 NULL);
757 if (!pmd_cache)
758 panic("pgtable_cache_init(): cannot create pmd cache");
759
760 if (!SHARED_KERNEL_PMD) { 757 if (!SHARED_KERNEL_PMD) {
761 /* If we're in PAE mode and have a non-shared 758 /* If we're in PAE mode and have a non-shared
762 kernel pmd, then the pgd size must be a 759 kernel pmd, then the pgd size must be a
@@ -770,11 +767,9 @@ void __init pgtable_cache_init(void)
770 pgd_cache = kmem_cache_create("pgd", 767 pgd_cache = kmem_cache_create("pgd",
771 pgd_size, 768 pgd_size,
772 pgd_size, 769 pgd_size,
773 0, 770 SLAB_PANIC,
774 pgd_ctor, 771 pgd_ctor,
775 (!SHARED_KERNEL_PMD) ? pgd_dtor : NULL); 772 (!SHARED_KERNEL_PMD) ? pgd_dtor : NULL);
776 if (!pgd_cache)
777 panic("pgtable_cache_init(): Cannot create pgd cache");
778} 773}
779 774
780/* 775/*
diff --git a/arch/ia64/ia32/ia32_support.c b/arch/ia64/ia32/ia32_support.c
index 6af400a12ca1..beea7a0b9dc6 100644
--- a/arch/ia64/ia32/ia32_support.c
+++ b/arch/ia64/ia32/ia32_support.c
@@ -252,10 +252,8 @@ ia32_init (void)
252 extern struct kmem_cache *partial_page_cachep; 252 extern struct kmem_cache *partial_page_cachep;
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), 0, 0, 255 sizeof(struct partial_page),
256 NULL, NULL); 256 0, SLAB_PANIC, NULL, NULL);
257 if (!partial_page_cachep)
258 panic("Cannot create partial page SLAB cache");
259 } 257 }
260#endif 258#endif
261 return 0; 259 return 0;
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 4416d5140c53..fe1fe852181a 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -183,11 +183,8 @@ void pgtable_cache_init(void)
183 "for size: %08x...\n", name, i, size); 183 "for size: %08x...\n", name, i, size);
184 pgtable_cache[i] = kmem_cache_create(name, 184 pgtable_cache[i] = kmem_cache_create(name,
185 size, size, 185 size, size,
186 0, 186 SLAB_PANIC,
187 zero_ctor, 187 zero_ctor,
188 NULL); 188 NULL);
189 if (! pgtable_cache[i])
190 panic("pgtable_cache_init(): could not create %s!\n",
191 name);
192 } 189 }
193} 190}
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index d0d45e2e0ab3..02aae06527dc 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -311,9 +311,9 @@ static int __init pmb_init(void)
311 311
312 BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES)); 312 BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
313 313
314 pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 314 pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
315 0, 0, pmb_cache_ctor, pmb_cache_dtor); 315 SLAB_PANIC, pmb_cache_ctor,
316 BUG_ON(!pmb_cache); 316 pmb_cache_dtor);
317 317
318 jump_to_P2(); 318 jump_to_P2();
319 319