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>
This commit is contained in:
Родитель
72280ede31
Коммит
0e6b9c98be
|
@ -176,13 +176,9 @@ void __init pgtable_cache_init(void)
|
||||||
{
|
{
|
||||||
pte_cache = kmem_cache_create("pte-cache",
|
pte_cache = kmem_cache_create("pte-cache",
|
||||||
sizeof(pte_t) * PTRS_PER_PTE,
|
sizeof(pte_t) * PTRS_PER_PTE,
|
||||||
0, 0, pte_cache_ctor, NULL);
|
0, SLAB_PANIC, pte_cache_ctor, NULL);
|
||||||
if (!pte_cache)
|
|
||||||
BUG();
|
|
||||||
|
|
||||||
pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
|
pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
|
||||||
sizeof(pgd_t) * PTRS_PER_PGD,
|
sizeof(pgd_t) * PTRS_PER_PGD,
|
||||||
0, 0, pgd_cache_ctor, NULL);
|
0, SLAB_PANIC, pgd_cache_ctor, NULL);
|
||||||
if (!pgd_cache)
|
|
||||||
BUG();
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,9 +151,7 @@ void __init pgtable_cache_init(void)
|
||||||
pgd_cache = kmem_cache_create("pgd",
|
pgd_cache = kmem_cache_create("pgd",
|
||||||
PTRS_PER_PGD * sizeof(pgd_t),
|
PTRS_PER_PGD * sizeof(pgd_t),
|
||||||
PTRS_PER_PGD * sizeof(pgd_t),
|
PTRS_PER_PGD * sizeof(pgd_t),
|
||||||
0,
|
SLAB_PANIC,
|
||||||
pgd_ctor,
|
pgd_ctor,
|
||||||
pgd_dtor);
|
pgd_dtor);
|
||||||
if (!pgd_cache)
|
|
||||||
panic("pgtable_cache_init(): Cannot create pgd cache");
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -751,12 +751,9 @@ void __init pgtable_cache_init(void)
|
||||||
pmd_cache = kmem_cache_create("pmd",
|
pmd_cache = kmem_cache_create("pmd",
|
||||||
PTRS_PER_PMD*sizeof(pmd_t),
|
PTRS_PER_PMD*sizeof(pmd_t),
|
||||||
PTRS_PER_PMD*sizeof(pmd_t),
|
PTRS_PER_PMD*sizeof(pmd_t),
|
||||||
0,
|
SLAB_PANIC,
|
||||||
pmd_ctor,
|
pmd_ctor,
|
||||||
NULL);
|
NULL);
|
||||||
if (!pmd_cache)
|
|
||||||
panic("pgtable_cache_init(): cannot create pmd cache");
|
|
||||||
|
|
||||||
if (!SHARED_KERNEL_PMD) {
|
if (!SHARED_KERNEL_PMD) {
|
||||||
/* If we're in PAE mode and have a non-shared
|
/* If we're in PAE mode and have a non-shared
|
||||||
kernel pmd, then the pgd size must be a
|
kernel pmd, then the pgd size must be a
|
||||||
|
@ -770,11 +767,9 @@ void __init pgtable_cache_init(void)
|
||||||
pgd_cache = kmem_cache_create("pgd",
|
pgd_cache = kmem_cache_create("pgd",
|
||||||
pgd_size,
|
pgd_size,
|
||||||
pgd_size,
|
pgd_size,
|
||||||
0,
|
SLAB_PANIC,
|
||||||
pgd_ctor,
|
pgd_ctor,
|
||||||
(!SHARED_KERNEL_PMD) ? pgd_dtor : NULL);
|
(!SHARED_KERNEL_PMD) ? pgd_dtor : NULL);
|
||||||
if (!pgd_cache)
|
|
||||||
panic("pgtable_cache_init(): Cannot create pgd cache");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -252,10 +252,8 @@ ia32_init (void)
|
||||||
extern struct kmem_cache *partial_page_cachep;
|
extern struct kmem_cache *partial_page_cachep;
|
||||||
|
|
||||||
partial_page_cachep = kmem_cache_create("partial_page_cache",
|
partial_page_cachep = kmem_cache_create("partial_page_cache",
|
||||||
sizeof(struct partial_page), 0, 0,
|
sizeof(struct partial_page),
|
||||||
NULL, NULL);
|
0, SLAB_PANIC, NULL, NULL);
|
||||||
if (!partial_page_cachep)
|
|
||||||
panic("Cannot create partial page SLAB cache");
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -183,11 +183,8 @@ void pgtable_cache_init(void)
|
||||||
"for size: %08x...\n", name, i, size);
|
"for size: %08x...\n", name, i, size);
|
||||||
pgtable_cache[i] = kmem_cache_create(name,
|
pgtable_cache[i] = kmem_cache_create(name,
|
||||||
size, size,
|
size, size,
|
||||||
0,
|
SLAB_PANIC,
|
||||||
zero_ctor,
|
zero_ctor,
|
||||||
NULL);
|
NULL);
|
||||||
if (! pgtable_cache[i])
|
|
||||||
panic("pgtable_cache_init(): could not create %s!\n",
|
|
||||||
name);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -311,9 +311,9 @@ static int __init pmb_init(void)
|
||||||
|
|
||||||
BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
|
BUG_ON(unlikely(nr_entries >= NR_PMB_ENTRIES));
|
||||||
|
|
||||||
pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry),
|
pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
|
||||||
0, 0, pmb_cache_ctor, pmb_cache_dtor);
|
SLAB_PANIC, pmb_cache_ctor,
|
||||||
BUG_ON(!pmb_cache);
|
pmb_cache_dtor);
|
||||||
|
|
||||||
jump_to_P2();
|
jump_to_P2();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче