aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_fdb.c2
-rw-r--r--net/core/flow.c2
-rw-r--r--net/core/neighbour.c2
-rw-r--r--net/core/skbuff.c4
-rw-r--r--net/core/sock.c6
-rw-r--r--net/dccp/ackvec.c4
-rw-r--r--net/dccp/ccid.c2
-rw-r--r--net/dccp/ccids/lib/loss_interval.c2
-rw-r--r--net/dccp/ccids/lib/packet_history.c4
-rw-r--r--net/dccp/proto.c2
-rw-r--r--net/decnet/dn_route.c2
-rw-r--r--net/decnet/dn_table.c2
-rw-r--r--net/ipv4/fib_hash.c4
-rw-r--r--net/ipv4/fib_trie.c2
-rw-r--r--net/ipv4/inetpeer.c2
-rw-r--r--net/ipv4/ipmr.c2
-rw-r--r--net/ipv4/ipvs/ip_vs_conn.c2
-rw-r--r--net/ipv4/route.c2
-rw-r--r--net/ipv4/tcp.c2
-rw-r--r--net/ipv6/ip6_fib.c2
-rw-r--r--net/ipv6/route.c2
-rw-r--r--net/ipv6/xfrm6_tunnel.c2
-rw-r--r--net/netfilter/nf_conntrack_core.c2
-rw-r--r--net/netfilter/nf_conntrack_expect.c2
-rw-r--r--net/netfilter/xt_hashlimit.c2
-rw-r--r--net/rxrpc/af_rxrpc.c2
-rw-r--r--net/sctp/protocol.c4
-rw-r--r--net/socket.c3
-rw-r--r--net/sunrpc/rpc_pipe.c2
-rw-r--r--net/sunrpc/sched.c4
-rw-r--r--net/tipc/handler.c2
-rw-r--r--net/xfrm/xfrm_input.c2
-rw-r--r--net/xfrm/xfrm_policy.c2
33 files changed, 41 insertions, 42 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 3fc697293819..69b70977f000 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -36,7 +36,7 @@ int __init br_fdb_init(void)
36 br_fdb_cache = kmem_cache_create("bridge_fdb_cache", 36 br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
37 sizeof(struct net_bridge_fdb_entry), 37 sizeof(struct net_bridge_fdb_entry),
38 0, 38 0,
39 SLAB_HWCACHE_ALIGN, NULL, NULL); 39 SLAB_HWCACHE_ALIGN, NULL);
40 if (!br_fdb_cache) 40 if (!br_fdb_cache)
41 return -ENOMEM; 41 return -ENOMEM;
42 42
diff --git a/net/core/flow.c b/net/core/flow.c
index 051430545a05..0ab5234b17d8 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -350,7 +350,7 @@ static int __init flow_cache_init(void)
350 flow_cachep = kmem_cache_create("flow_cache", 350 flow_cachep = kmem_cache_create("flow_cache",
351 sizeof(struct flow_cache_entry), 351 sizeof(struct flow_cache_entry),
352 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, 352 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
353 NULL, NULL); 353 NULL);
354 flow_hash_shift = 10; 354 flow_hash_shift = 10;
355 flow_lwm = 2 * flow_hash_size; 355 flow_lwm = 2 * flow_hash_size;
356 flow_hwm = 4 * flow_hash_size; 356 flow_hwm = 4 * flow_hash_size;
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");
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 0583e8498f13..35021eb3ed07 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2021,13 +2021,13 @@ void __init skb_init(void)
2021 sizeof(struct sk_buff), 2021 sizeof(struct sk_buff),
2022 0, 2022 0,
2023 SLAB_HWCACHE_ALIGN|SLAB_PANIC, 2023 SLAB_HWCACHE_ALIGN|SLAB_PANIC,
2024 NULL, NULL); 2024 NULL);
2025 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache", 2025 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
2026 (2*sizeof(struct sk_buff)) + 2026 (2*sizeof(struct sk_buff)) +
2027 sizeof(atomic_t), 2027 sizeof(atomic_t),
2028 0, 2028 0,
2029 SLAB_HWCACHE_ALIGN|SLAB_PANIC, 2029 SLAB_HWCACHE_ALIGN|SLAB_PANIC,
2030 NULL, NULL); 2030 NULL);
2031} 2031}
2032 2032
2033/** 2033/**
diff --git a/net/core/sock.c b/net/core/sock.c
index 239a08a6ff24..bd209c4477a9 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1767,7 +1767,7 @@ int proto_register(struct proto *prot, int alloc_slab)
1767 1767
1768 if (alloc_slab) { 1768 if (alloc_slab) {
1769 prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0, 1769 prot->slab = kmem_cache_create(prot->name, prot->obj_size, 0,
1770 SLAB_HWCACHE_ALIGN, NULL, NULL); 1770 SLAB_HWCACHE_ALIGN, NULL);
1771 1771
1772 if (prot->slab == NULL) { 1772 if (prot->slab == NULL) {
1773 printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n", 1773 printk(KERN_CRIT "%s: Can't create sock SLAB cache!\n",
@@ -1785,7 +1785,7 @@ int proto_register(struct proto *prot, int alloc_slab)
1785 sprintf(request_sock_slab_name, mask, prot->name); 1785 sprintf(request_sock_slab_name, mask, prot->name);
1786 prot->rsk_prot->slab = kmem_cache_create(request_sock_slab_name, 1786 prot->rsk_prot->slab = kmem_cache_create(request_sock_slab_name,
1787 prot->rsk_prot->obj_size, 0, 1787 prot->rsk_prot->obj_size, 0,
1788 SLAB_HWCACHE_ALIGN, NULL, NULL); 1788 SLAB_HWCACHE_ALIGN, NULL);
1789 1789
1790 if (prot->rsk_prot->slab == NULL) { 1790 if (prot->rsk_prot->slab == NULL) {
1791 printk(KERN_CRIT "%s: Can't create request sock SLAB cache!\n", 1791 printk(KERN_CRIT "%s: Can't create request sock SLAB cache!\n",
@@ -1807,7 +1807,7 @@ int proto_register(struct proto *prot, int alloc_slab)
1807 kmem_cache_create(timewait_sock_slab_name, 1807 kmem_cache_create(timewait_sock_slab_name,
1808 prot->twsk_prot->twsk_obj_size, 1808 prot->twsk_prot->twsk_obj_size,
1809 0, SLAB_HWCACHE_ALIGN, 1809 0, SLAB_HWCACHE_ALIGN,
1810 NULL, NULL); 1810 NULL);
1811 if (prot->twsk_prot->twsk_slab == NULL) 1811 if (prot->twsk_prot->twsk_slab == NULL)
1812 goto out_free_timewait_sock_slab_name; 1812 goto out_free_timewait_sock_slab_name;
1813 } 1813 }
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index 01030f346177..7ac775f9a64b 100644
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -481,14 +481,14 @@ int __init dccp_ackvec_init(void)
481{ 481{
482 dccp_ackvec_slab = kmem_cache_create("dccp_ackvec", 482 dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
483 sizeof(struct dccp_ackvec), 0, 483 sizeof(struct dccp_ackvec), 0,
484 SLAB_HWCACHE_ALIGN, NULL, NULL); 484 SLAB_HWCACHE_ALIGN, NULL);
485 if (dccp_ackvec_slab == NULL) 485 if (dccp_ackvec_slab == NULL)
486 goto out_err; 486 goto out_err;
487 487
488 dccp_ackvec_record_slab = 488 dccp_ackvec_record_slab =
489 kmem_cache_create("dccp_ackvec_record", 489 kmem_cache_create("dccp_ackvec_record",
490 sizeof(struct dccp_ackvec_record), 490 sizeof(struct dccp_ackvec_record),
491 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 491 0, SLAB_HWCACHE_ALIGN, NULL);
492 if (dccp_ackvec_record_slab == NULL) 492 if (dccp_ackvec_record_slab == NULL)
493 goto out_destroy_slab; 493 goto out_destroy_slab;
494 494
diff --git a/net/dccp/ccid.c b/net/dccp/ccid.c
index d8cf92f09e68..ccbf72c793b6 100644
--- a/net/dccp/ccid.c
+++ b/net/dccp/ccid.c
@@ -69,7 +69,7 @@ static struct kmem_cache *ccid_kmem_cache_create(int obj_size, const char *fmt,.
69 if (slab_name == NULL) 69 if (slab_name == NULL)
70 return NULL; 70 return NULL;
71 slab = kmem_cache_create(slab_name, sizeof(struct ccid) + obj_size, 0, 71 slab = kmem_cache_create(slab_name, sizeof(struct ccid) + obj_size, 0,
72 SLAB_HWCACHE_ALIGN, NULL, NULL); 72 SLAB_HWCACHE_ALIGN, NULL);
73 if (slab == NULL) 73 if (slab == NULL)
74 kfree(slab_name); 74 kfree(slab_name);
75 return slab; 75 return slab;
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index dd0fc992b042..174d3f13d93f 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -282,7 +282,7 @@ static __init int dccp_li_init(void)
282{ 282{
283 dccp_li_cachep = kmem_cache_create("dccp_li_hist", 283 dccp_li_cachep = kmem_cache_create("dccp_li_hist",
284 sizeof(struct dccp_li_hist_entry), 284 sizeof(struct dccp_li_hist_entry),
285 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 285 0, SLAB_HWCACHE_ALIGN, NULL);
286 return dccp_li_cachep == NULL ? -ENOBUFS : 0; 286 return dccp_li_cachep == NULL ? -ENOBUFS : 0;
287} 287}
288 288
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 2e8ef42721e2..34c4f6047724 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -59,7 +59,7 @@ struct dccp_tx_hist *dccp_tx_hist_new(const char *name)
59 hist->dccptxh_slab = kmem_cache_create(slab_name, 59 hist->dccptxh_slab = kmem_cache_create(slab_name,
60 sizeof(struct dccp_tx_hist_entry), 60 sizeof(struct dccp_tx_hist_entry),
61 0, SLAB_HWCACHE_ALIGN, 61 0, SLAB_HWCACHE_ALIGN,
62 NULL, NULL); 62 NULL);
63 if (hist->dccptxh_slab == NULL) 63 if (hist->dccptxh_slab == NULL)
64 goto out_free_slab_name; 64 goto out_free_slab_name;
65out: 65out:
@@ -148,7 +148,7 @@ struct dccp_rx_hist *dccp_rx_hist_new(const char *name)
148 hist->dccprxh_slab = kmem_cache_create(slab_name, 148 hist->dccprxh_slab = kmem_cache_create(slab_name,
149 sizeof(struct dccp_rx_hist_entry), 149 sizeof(struct dccp_rx_hist_entry),
150 0, SLAB_HWCACHE_ALIGN, 150 0, SLAB_HWCACHE_ALIGN,
151 NULL, NULL); 151 NULL);
152 if (hist->dccprxh_slab == NULL) 152 if (hist->dccprxh_slab == NULL)
153 goto out_free_slab_name; 153 goto out_free_slab_name;
154out: 154out:
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 6607b7b14f34..04b59ec4f512 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -1003,7 +1003,7 @@ static int __init dccp_init(void)
1003 dccp_hashinfo.bind_bucket_cachep = 1003 dccp_hashinfo.bind_bucket_cachep =
1004 kmem_cache_create("dccp_bind_bucket", 1004 kmem_cache_create("dccp_bind_bucket",
1005 sizeof(struct inet_bind_bucket), 0, 1005 sizeof(struct inet_bind_bucket), 0,
1006 SLAB_HWCACHE_ALIGN, NULL, NULL); 1006 SLAB_HWCACHE_ALIGN, NULL);
1007 if (!dccp_hashinfo.bind_bucket_cachep) 1007 if (!dccp_hashinfo.bind_bucket_cachep)
1008 goto out; 1008 goto out;
1009 1009
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;
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index d6615c9361e9..fda0772fa215 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -881,7 +881,7 @@ void __init dn_fib_table_init(void)
881 dn_hash_kmem = kmem_cache_create("dn_fib_info_cache", 881 dn_hash_kmem = kmem_cache_create("dn_fib_info_cache",
882 sizeof(struct dn_fib_info), 882 sizeof(struct dn_fib_info),
883 0, SLAB_HWCACHE_ALIGN, 883 0, SLAB_HWCACHE_ALIGN,
884 NULL, NULL); 884 NULL);
885} 885}
886 886
887void __exit dn_fib_table_cleanup(void) 887void __exit dn_fib_table_cleanup(void)
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 07e843a47dde..9ad1d9ff9ce7 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)
771 fn_hash_kmem = kmem_cache_create("ip_fib_hash", 771 fn_hash_kmem = kmem_cache_create("ip_fib_hash",
772 sizeof(struct fib_node), 772 sizeof(struct fib_node),
773 0, SLAB_HWCACHE_ALIGN, 773 0, SLAB_HWCACHE_ALIGN,
774 NULL, NULL); 774 NULL);
775 775
776 if (fn_alias_kmem == NULL) 776 if (fn_alias_kmem == NULL)
777 fn_alias_kmem = kmem_cache_create("ip_fib_alias", 777 fn_alias_kmem = kmem_cache_create("ip_fib_alias",
778 sizeof(struct fib_alias), 778 sizeof(struct fib_alias),
779 0, SLAB_HWCACHE_ALIGN, 779 0, SLAB_HWCACHE_ALIGN,
780 NULL, NULL); 780 NULL);
781 781
782 tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash), 782 tb = kmalloc(sizeof(struct fib_table) + sizeof(struct fn_hash),
783 GFP_KERNEL); 783 GFP_KERNEL);
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 30e332ade61b..9ca786a6fd3c 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1970,7 +1970,7 @@ struct fib_table * __init fib_hash_init(u32 id)
1970 fn_alias_kmem = kmem_cache_create("ip_fib_alias", 1970 fn_alias_kmem = kmem_cache_create("ip_fib_alias",
1971 sizeof(struct fib_alias), 1971 sizeof(struct fib_alias),
1972 0, SLAB_HWCACHE_ALIGN, 1972 0, SLAB_HWCACHE_ALIGN,
1973 NULL, NULL); 1973 NULL);
1974 1974
1975 tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie), 1975 tb = kmalloc(sizeof(struct fib_table) + sizeof(struct trie),
1976 GFP_KERNEL); 1976 GFP_KERNEL);
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.
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index d96582acdf69..7003cc1b7fe2 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1917,7 +1917,7 @@ void __init ip_mr_init(void)
1917 mrt_cachep = kmem_cache_create("ip_mrt_cache", 1917 mrt_cachep = kmem_cache_create("ip_mrt_cache",
1918 sizeof(struct mfc_cache), 1918 sizeof(struct mfc_cache),
1919 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, 1919 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
1920 NULL, NULL); 1920 NULL);
1921 init_timer(&ipmr_expire_timer); 1921 init_timer(&ipmr_expire_timer);
1922 ipmr_expire_timer.function=ipmr_expire_process; 1922 ipmr_expire_timer.function=ipmr_expire_process;
1923 register_netdevice_notifier(&ip_mr_notifier); 1923 register_netdevice_notifier(&ip_mr_notifier);
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 3b446b1a6b9c..d612a6a5d957 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -901,7 +901,7 @@ int ip_vs_conn_init(void)
901 /* Allocate ip_vs_conn slab cache */ 901 /* Allocate ip_vs_conn slab cache */
902 ip_vs_conn_cachep = kmem_cache_create("ip_vs_conn", 902 ip_vs_conn_cachep = kmem_cache_create("ip_vs_conn",
903 sizeof(struct ip_vs_conn), 0, 903 sizeof(struct ip_vs_conn), 0,
904 SLAB_HWCACHE_ALIGN, NULL, NULL); 904 SLAB_HWCACHE_ALIGN, NULL);
905 if (!ip_vs_conn_cachep) { 905 if (!ip_vs_conn_cachep) {
906 vfree(ip_vs_conn_tab); 906 vfree(ip_vs_conn_tab);
907 return -ENOMEM; 907 return -ENOMEM;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 88fa648d7ba3..df42b7fb3268 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2967,7 +2967,7 @@ int __init ip_rt_init(void)
2967 2967
2968 ipv4_dst_ops.kmem_cachep = 2968 ipv4_dst_ops.kmem_cachep =
2969 kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0, 2969 kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0,
2970 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2970 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
2971 2971
2972 ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep; 2972 ipv4_dst_blackhole_ops.kmem_cachep = ipv4_dst_ops.kmem_cachep;
2973 2973
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 987b94403be5..da4c0b6ab79a 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2430,7 +2430,7 @@ void __init tcp_init(void)
2430 tcp_hashinfo.bind_bucket_cachep = 2430 tcp_hashinfo.bind_bucket_cachep =
2431 kmem_cache_create("tcp_bind_bucket", 2431 kmem_cache_create("tcp_bind_bucket",
2432 sizeof(struct inet_bind_bucket), 0, 2432 sizeof(struct inet_bind_bucket), 0,
2433 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2433 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
2434 2434
2435 /* Size and allocate the main established and bind bucket 2435 /* Size and allocate the main established and bind bucket
2436 * hash tables. 2436 * hash tables.
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
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index fe8d9837f9f8..919de682b331 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2555,7 +2555,7 @@ void __init ip6_route_init(void)
2555#endif 2555#endif
2556 ip6_dst_ops.kmem_cachep = 2556 ip6_dst_ops.kmem_cachep =
2557 kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, 2557 kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
2558 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); 2558 SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
2559 ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops.kmem_cachep; 2559 ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops.kmem_cachep;
2560 2560
2561 fib6_init(); 2561 fib6_init();
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 6f87dd568ded..30f3236c402a 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -84,7 +84,7 @@ static int xfrm6_tunnel_spi_init(void)
84 xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi", 84 xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",
85 sizeof(struct xfrm6_tunnel_spi), 85 sizeof(struct xfrm6_tunnel_spi),
86 0, SLAB_HWCACHE_ALIGN, 86 0, SLAB_HWCACHE_ALIGN,
87 NULL, NULL); 87 NULL);
88 if (!xfrm6_tunnel_spi_kmem) 88 if (!xfrm6_tunnel_spi_kmem)
89 return -ENOMEM; 89 return -ENOMEM;
90 90
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 8cce814f6bee..aa086c83af80 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1108,7 +1108,7 @@ int __init nf_conntrack_init(void)
1108 1108
1109 nf_conntrack_cachep = kmem_cache_create("nf_conntrack", 1109 nf_conntrack_cachep = kmem_cache_create("nf_conntrack",
1110 sizeof(struct nf_conn), 1110 sizeof(struct nf_conn),
1111 0, 0, NULL, NULL); 1111 0, 0, NULL);
1112 if (!nf_conntrack_cachep) { 1112 if (!nf_conntrack_cachep) {
1113 printk(KERN_ERR "Unable to create nf_conn slab cache\n"); 1113 printk(KERN_ERR "Unable to create nf_conn slab cache\n");
1114 goto err_free_hash; 1114 goto err_free_hash;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 2191fe008f60..1aa6229ca99f 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -540,7 +540,7 @@ int __init nf_conntrack_expect_init(void)
540 540
541 nf_ct_expect_cachep = kmem_cache_create("nf_conntrack_expect", 541 nf_ct_expect_cachep = kmem_cache_create("nf_conntrack_expect",
542 sizeof(struct nf_conntrack_expect), 542 sizeof(struct nf_conntrack_expect),
543 0, 0, NULL, NULL); 543 0, 0, NULL);
544 if (!nf_ct_expect_cachep) 544 if (!nf_ct_expect_cachep)
545 goto err2; 545 goto err2;
546 546
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index d6b3d01975b6..bd45f9d3f7d0 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -738,7 +738,7 @@ static int __init xt_hashlimit_init(void)
738 err = -ENOMEM; 738 err = -ENOMEM;
739 hashlimit_cachep = kmem_cache_create("xt_hashlimit", 739 hashlimit_cachep = kmem_cache_create("xt_hashlimit",
740 sizeof(struct dsthash_ent), 0, 0, 740 sizeof(struct dsthash_ent), 0, 0,
741 NULL, NULL); 741 NULL);
742 if (!hashlimit_cachep) { 742 if (!hashlimit_cachep) {
743 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n"); 743 printk(KERN_ERR "xt_hashlimit: unable to create slab cache\n");
744 goto err2; 744 goto err2;
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 46f6d572ad2d..16a68df4e36b 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -792,7 +792,7 @@ static int __init af_rxrpc_init(void)
792 ret = -ENOMEM; 792 ret = -ENOMEM;
793 rxrpc_call_jar = kmem_cache_create( 793 rxrpc_call_jar = kmem_cache_create(
794 "rxrpc_call_jar", sizeof(struct rxrpc_call), 0, 794 "rxrpc_call_jar", sizeof(struct rxrpc_call), 0,
795 SLAB_HWCACHE_ALIGN, NULL, NULL); 795 SLAB_HWCACHE_ALIGN, NULL);
796 if (!rxrpc_call_jar) { 796 if (!rxrpc_call_jar) {
797 printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n"); 797 printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n");
798 goto error_call_jar; 798 goto error_call_jar;
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 34bab36637ac..e98579b788b8 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -980,14 +980,14 @@ SCTP_STATIC __init int sctp_init(void)
980 sctp_bucket_cachep = kmem_cache_create("sctp_bind_bucket", 980 sctp_bucket_cachep = kmem_cache_create("sctp_bind_bucket",
981 sizeof(struct sctp_bind_bucket), 981 sizeof(struct sctp_bind_bucket),
982 0, SLAB_HWCACHE_ALIGN, 982 0, SLAB_HWCACHE_ALIGN,
983 NULL, NULL); 983 NULL);
984 if (!sctp_bucket_cachep) 984 if (!sctp_bucket_cachep)
985 goto out; 985 goto out;
986 986
987 sctp_chunk_cachep = kmem_cache_create("sctp_chunk", 987 sctp_chunk_cachep = kmem_cache_create("sctp_chunk",
988 sizeof(struct sctp_chunk), 988 sizeof(struct sctp_chunk),
989 0, SLAB_HWCACHE_ALIGN, 989 0, SLAB_HWCACHE_ALIGN,
990 NULL, NULL); 990 NULL);
991 if (!sctp_chunk_cachep) 991 if (!sctp_chunk_cachep)
992 goto err_chunk_cachep; 992 goto err_chunk_cachep;
993 993
diff --git a/net/socket.c b/net/socket.c
index b71114250046..ec077037f534 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -272,8 +272,7 @@ static int init_inodecache(void)
272 (SLAB_HWCACHE_ALIGN | 272 (SLAB_HWCACHE_ALIGN |
273 SLAB_RECLAIM_ACCOUNT | 273 SLAB_RECLAIM_ACCOUNT |
274 SLAB_MEM_SPREAD), 274 SLAB_MEM_SPREAD),
275 init_once, 275 init_once);
276 NULL);
277 if (sock_inode_cachep == NULL) 276 if (sock_inode_cachep == NULL)
278 return -ENOMEM; 277 return -ENOMEM;
279 return 0; 278 return 0;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 5b2b6fb244f2..650af064ff8d 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -867,7 +867,7 @@ int register_rpc_pipefs(void)
867 sizeof(struct rpc_inode), 867 sizeof(struct rpc_inode),
868 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| 868 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
869 SLAB_MEM_SPREAD), 869 SLAB_MEM_SPREAD),
870 init_once, NULL); 870 init_once);
871 if (!rpc_inode_cachep) 871 if (!rpc_inode_cachep)
872 return -ENOMEM; 872 return -ENOMEM;
873 err = register_filesystem(&rpc_pipe_fs_type); 873 err = register_filesystem(&rpc_pipe_fs_type);
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 2ac43c41c3a9..b5723c262a3e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -1031,13 +1031,13 @@ rpc_init_mempool(void)
1031 rpc_task_slabp = kmem_cache_create("rpc_tasks", 1031 rpc_task_slabp = kmem_cache_create("rpc_tasks",
1032 sizeof(struct rpc_task), 1032 sizeof(struct rpc_task),
1033 0, SLAB_HWCACHE_ALIGN, 1033 0, SLAB_HWCACHE_ALIGN,
1034 NULL, NULL); 1034 NULL);
1035 if (!rpc_task_slabp) 1035 if (!rpc_task_slabp)
1036 goto err_nomem; 1036 goto err_nomem;
1037 rpc_buffer_slabp = kmem_cache_create("rpc_buffers", 1037 rpc_buffer_slabp = kmem_cache_create("rpc_buffers",
1038 RPC_BUFFER_MAXSIZE, 1038 RPC_BUFFER_MAXSIZE,
1039 0, SLAB_HWCACHE_ALIGN, 1039 0, SLAB_HWCACHE_ALIGN,
1040 NULL, NULL); 1040 NULL);
1041 if (!rpc_buffer_slabp) 1041 if (!rpc_buffer_slabp)
1042 goto err_nomem; 1042 goto err_nomem;
1043 rpc_task_mempool = mempool_create_slab_pool(RPC_TASK_POOLSIZE, 1043 rpc_task_mempool = mempool_create_slab_pool(RPC_TASK_POOLSIZE,
diff --git a/net/tipc/handler.c b/net/tipc/handler.c
index e1dcf663f8a6..0c70010a7dfe 100644
--- a/net/tipc/handler.c
+++ b/net/tipc/handler.c
@@ -97,7 +97,7 @@ int tipc_handler_start(void)
97{ 97{
98 tipc_queue_item_cache = 98 tipc_queue_item_cache =
99 kmem_cache_create("tipc_queue_items", sizeof(struct queue_item), 99 kmem_cache_create("tipc_queue_items", sizeof(struct queue_item),
100 0, SLAB_HWCACHE_ALIGN, NULL, NULL); 100 0, SLAB_HWCACHE_ALIGN, NULL);
101 if (!tipc_queue_item_cache) 101 if (!tipc_queue_item_cache)
102 return -ENOMEM; 102 return -ENOMEM;
103 103
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 5c4695840c58..113f44429982 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -83,5 +83,5 @@ void __init xfrm_input_init(void)
83 secpath_cachep = kmem_cache_create("secpath_cache", 83 secpath_cachep = kmem_cache_create("secpath_cache",
84 sizeof(struct sec_path), 84 sizeof(struct sec_path),
85 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, 85 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
86 NULL, NULL); 86 NULL);
87} 87}
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index cfaf17c8851e..c3a4b0a18687 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2378,7 +2378,7 @@ static void __init xfrm_policy_init(void)
2378 xfrm_dst_cache = kmem_cache_create("xfrm_dst_cache", 2378 xfrm_dst_cache = kmem_cache_create("xfrm_dst_cache",
2379 sizeof(struct xfrm_dst), 2379 sizeof(struct xfrm_dst),
2380 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, 2380 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
2381 NULL, NULL); 2381 NULL);
2382 2382
2383 hmask = 8 - 1; 2383 hmask = 8 - 1;
2384 sz = (hmask+1) * sizeof(struct hlist_head); 2384 sz = (hmask+1) * sizeof(struct hlist_head);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-23 04:23:59 -0500