Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54526
b: refs/heads/master
c: 0e6b9c9
h: refs/heads/master
v: v3
  • Loading branch information
Akinobu Mita authored and Linus Torvalds committed May 8, 2007
1 parent f4b39f5 commit c717e50
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72280ede316911fd5a82ef78d12a6705b1007d36
refs/heads/master: 0e6b9c98be1b517bf99a21d8a7036a8a21e47dd1
8 changes: 2 additions & 6 deletions trunk/arch/arm26/mm/memc.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,9 @@ void __init pgtable_cache_init(void)
{
pte_cache = kmem_cache_create("pte-cache",
sizeof(pte_t) * PTRS_PER_PTE,
0, 0, pte_cache_ctor, NULL);
if (!pte_cache)
BUG();
0, SLAB_PANIC, pte_cache_ctor, NULL);

pgd_cache = kmem_cache_create("pgd-cache", MEMC_TABLE_SIZE +
sizeof(pgd_t) * PTRS_PER_PGD,
0, 0, pgd_cache_ctor, NULL);
if (!pgd_cache)
BUG();
0, SLAB_PANIC, pgd_cache_ctor, NULL);
}
4 changes: 1 addition & 3 deletions trunk/arch/frv/mm/pgalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ void __init pgtable_cache_init(void)
pgd_cache = kmem_cache_create("pgd",
PTRS_PER_PGD * sizeof(pgd_t),
PTRS_PER_PGD * sizeof(pgd_t),
0,
SLAB_PANIC,
pgd_ctor,
pgd_dtor);
if (!pgd_cache)
panic("pgtable_cache_init(): Cannot create pgd cache");
}
9 changes: 2 additions & 7 deletions trunk/arch/i386/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,12 +751,9 @@ void __init pgtable_cache_init(void)
pmd_cache = kmem_cache_create("pmd",
PTRS_PER_PMD*sizeof(pmd_t),
PTRS_PER_PMD*sizeof(pmd_t),
0,
SLAB_PANIC,
pmd_ctor,
NULL);
if (!pmd_cache)
panic("pgtable_cache_init(): cannot create pmd cache");

if (!SHARED_KERNEL_PMD) {
/* If we're in PAE mode and have a non-shared
kernel pmd, then the pgd size must be a
Expand All @@ -770,11 +767,9 @@ void __init pgtable_cache_init(void)
pgd_cache = kmem_cache_create("pgd",
pgd_size,
pgd_size,
0,
SLAB_PANIC,
pgd_ctor,
(!SHARED_KERNEL_PMD) ? pgd_dtor : NULL);
if (!pgd_cache)
panic("pgtable_cache_init(): Cannot create pgd cache");
}

/*
Expand Down
6 changes: 2 additions & 4 deletions trunk/arch/ia64/ia32/ia32_support.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,8 @@ ia32_init (void)
extern struct kmem_cache *partial_page_cachep;

partial_page_cachep = kmem_cache_create("partial_page_cache",
sizeof(struct partial_page), 0, 0,
NULL, NULL);
if (!partial_page_cachep)
panic("Cannot create partial page SLAB cache");
sizeof(struct partial_page),
0, SLAB_PANIC, NULL, NULL);
}
#endif
return 0;
Expand Down
5 changes: 1 addition & 4 deletions trunk/arch/powerpc/mm/init_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,8 @@ void pgtable_cache_init(void)
"for size: %08x...\n", name, i, size);
pgtable_cache[i] = kmem_cache_create(name,
size, size,
0,
SLAB_PANIC,
zero_ctor,
NULL);
if (! pgtable_cache[i])
panic("pgtable_cache_init(): could not create %s!\n",
name);
}
}
6 changes: 3 additions & 3 deletions trunk/arch/sh/mm/pmb.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ 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, 0, pmb_cache_ctor, pmb_cache_dtor);
BUG_ON(!pmb_cache);
pmb_cache = kmem_cache_create("pmb", sizeof(struct pmb_entry), 0,
SLAB_PANIC, pmb_cache_ctor,
pmb_cache_dtor);

jump_to_P2();

Expand Down

0 comments on commit c717e50

Please sign in to comment.