diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 18:38:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 18:38:13 -0700 |
commit | 9a79b2274186fade17134929d4f85b70d59a3840 (patch) | |
tree | d74e9ecc83ef617166445501b49087726595fb63 /net/ipv4/fib_hash.c | |
parent | 75473c1d3930896bbabcc99bb58fafd53ef42473 (diff) | |
parent | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (diff) | |
download | kernel_samsung_espresso10-9a79b2274186fade17134929d4f85b70d59a3840.zip kernel_samsung_espresso10-9a79b2274186fade17134929d4f85b70d59a3840.tar.gz kernel_samsung_espresso10-9a79b2274186fade17134929d4f85b70d59a3840.tar.bz2 |
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/fib_hash.c')
-rw-r--r-- | net/ipv4/fib_hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 07e843a..9ad1d9f 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c @@ -771,13 +771,13 @@ struct fib_table * __init fib_hash_init(u32 id) fn_hash_kmem = kmem_cache_create("ip_fib_hash", sizeof(struct fib_node), 0, SLAB_HWCACHE_ALIGN, - NULL, NULL); + NULL); if (fn_alias_kmem == NULL) fn_alias_kmem = kmem_cache_create("ip_fib_alias", sizeof(struct fib_alias), 0, SLAB_HWCACHE_ALIGN, - NULL, NULL); + NULL); tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash), GFP_KERNEL); |