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/inetpeer.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/inetpeer.c')
| -rw-r--r-- | net/ipv4/inetpeer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index 2f44e6128068..6cbce96a54ce 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c | |||
| @@ -123,7 +123,7 @@ void __init inet_initpeers(void) | |||
| 123 | peer_cachep = kmem_cache_create("inet_peer_cache", | 123 | peer_cachep = kmem_cache_create("inet_peer_cache", |
| 124 | sizeof(struct inet_peer), | 124 | sizeof(struct inet_peer), |
| 125 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 125 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
| 126 | NULL, NULL); | 126 | NULL); |
| 127 | 127 | ||
| 128 | /* All the timers, started at system startup tend | 128 | /* All the timers, started at system startup tend |
| 129 | to synchronize. Perturb it a bit. | 129 | to synchronize. Perturb it a bit. |