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/ipv6/ip6_fib.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/ipv6/ip6_fib.c')
-rw-r--r-- | net/ipv6/ip6_fib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 662a7d9681fd..6a612a701eaa 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
@@ -1474,7 +1474,7 @@ void __init fib6_init(void) | |||
1474 | fib6_node_kmem = kmem_cache_create("fib6_nodes", | 1474 | fib6_node_kmem = kmem_cache_create("fib6_nodes", |
1475 | sizeof(struct fib6_node), | 1475 | sizeof(struct fib6_node), |
1476 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 1476 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
1477 | NULL, NULL); | 1477 | NULL); |
1478 | 1478 | ||
1479 | fib6_tables_init(); | 1479 | fib6_tables_init(); |
1480 | 1480 | ||