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 /net/dccp/ackvec.c | |
| 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 'net/dccp/ackvec.c')
| -rw-r--r-- | net/dccp/ackvec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index 01030f346177..7ac775f9a64b 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c | |||
| @@ -481,14 +481,14 @@ int __init dccp_ackvec_init(void) | |||
| 481 | { | 481 | { |
| 482 | dccp_ackvec_slab = kmem_cache_create("dccp_ackvec", | 482 | dccp_ackvec_slab = kmem_cache_create("dccp_ackvec", |
| 483 | sizeof(struct dccp_ackvec), 0, | 483 | sizeof(struct dccp_ackvec), 0, |
| 484 | SLAB_HWCACHE_ALIGN, NULL, NULL); | 484 | SLAB_HWCACHE_ALIGN, NULL); |
| 485 | if (dccp_ackvec_slab == NULL) | 485 | if (dccp_ackvec_slab == NULL) |
| 486 | goto out_err; | 486 | goto out_err; |
| 487 | 487 | ||
| 488 | dccp_ackvec_record_slab = | 488 | dccp_ackvec_record_slab = |
| 489 | kmem_cache_create("dccp_ackvec_record", | 489 | kmem_cache_create("dccp_ackvec_record", |
| 490 | sizeof(struct dccp_ackvec_record), | 490 | sizeof(struct dccp_ackvec_record), |
| 491 | 0, SLAB_HWCACHE_ALIGN, NULL, NULL); | 491 | 0, SLAB_HWCACHE_ALIGN, NULL); |
| 492 | if (dccp_ackvec_record_slab == NULL) | 492 | if (dccp_ackvec_record_slab == NULL) |
| 493 | goto out_destroy_slab; | 493 | goto out_destroy_slab; |
| 494 | 494 | ||