diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 21:38:13 -0400 |
commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
tree | d74e9ecc83ef617166445501b49087726595fb63 /arch/sh | |
parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) |
Merge branch 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'kmem_death' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
mm: Remove slab destructors from kmem_cache_create().
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 3 | ||||
-rw-r--r-- | arch/sh/mm/pmb.c | 2 |
2 files changed, 2 insertions, 3 deletions
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 | ||