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/core/neighbour.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/core/neighbour.c')
| -rw-r--r-- | net/core/neighbour.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 9df26a07f067..ca2a1533138a 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
| @@ -1347,7 +1347,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl) | |||
| 1347 | tbl->kmem_cachep = | 1347 | tbl->kmem_cachep = |
| 1348 | kmem_cache_create(tbl->id, tbl->entry_size, 0, | 1348 | kmem_cache_create(tbl->id, tbl->entry_size, 0, |
| 1349 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, | 1349 | SLAB_HWCACHE_ALIGN|SLAB_PANIC, |
| 1350 | NULL, NULL); | 1350 | NULL); |
| 1351 | tbl->stats = alloc_percpu(struct neigh_statistics); | 1351 | tbl->stats = alloc_percpu(struct neigh_statistics); |
| 1352 | if (!tbl->stats) | 1352 | if (!tbl->stats) |
| 1353 | panic("cannot create neighbour cache statistics"); | 1353 | panic("cannot create neighbour cache statistics"); |