diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2007-05-08 03:23:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:14:57 -0400 |
commit | 0e6b9c98be1b517bf99a21d8a7036a8a21e47dd1 (patch) | |
tree | d38264506008361717a737581c26f7d3de28284b /arch/i386/mm | |
parent | 72280ede316911fd5a82ef78d12a6705b1007d36 (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>
Diffstat (limited to 'arch/i386/mm')
-rw-r--r-- | arch/i386/mm/init.c | 9 |
1 files changed, 2 insertions, 7 deletions
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 | /* |