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/ipv4/tcp.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/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 987b94403be5..da4c0b6ab79a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
| @@ -2430,7 +2430,7 @@ void __init tcp_init(void) | |||
| 2430 | tcp_hashinfo.bind_bucket_cachep = | 2430 | tcp_hashinfo.bind_bucket_cachep = |
| 2431 | kmem_cache_create("tcp_bind_bucket", | 2431 | kmem_cache_create("tcp_bind_bucket", |
| 2432 | sizeof(struct inet_bind_bucket), 0, | 2432 | sizeof(struct inet_bind_bucket), 0, |
| 2433 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 2433 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
| 2434 | 2434 | ||
| 2435 | /* Size and allocate the main established and bind bucket | 2435 | /* Size and allocate the main established and bind bucket |
| 2436 | * hash tables. | 2436 | * hash tables. |