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/decnet/dn_route.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/decnet/dn_route.c')
-rw-r--r-- | net/decnet/dn_route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 82622fb6f68f..f2a61ef2af9c 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -1770,7 +1770,7 @@ void __init dn_route_init(void) | |||
1770 | 1770 | ||
1771 | dn_dst_ops.kmem_cachep = | 1771 | dn_dst_ops.kmem_cachep = |
1772 | kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0, | 1772 | kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0, |
1773 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 1773 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
1774 | init_timer(&dn_route_timer); | 1774 | init_timer(&dn_route_timer); |
1775 | dn_route_timer.function = dn_dst_check_expire; | 1775 | dn_route_timer.function = dn_dst_check_expire; |
1776 | dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ; | 1776 | dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ; |