12 files changed, 22 insertions, 62 deletions

diff --git a/net/core/flow.c b/net/core/flow.c
index 645241165e6c..f23e7e386543 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -343,12 +343,8 @@ static int __init flow_cache_init(void)
 
         flow_cachep = kmem_cache_create("flow_cache",
                                         sizeof(struct flow_cache_entry),
-                                        0, SLAB_HWCACHE_ALIGN,
+                                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                         NULL, NULL);
-
-        if (!flow_cachep)
-                panic("NET: failed to allocate flow cache slab\n");
-
         flow_hash_shift = 10;
         flow_lwm = 2 * flow_hash_size;
         flow_hwm = 4 * flow_hash_size;
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index c0a27407f445..a45bd2124d6b 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1339,14 +1339,10 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                           neigh_rand_reach_time(tbl->parms.base_reachable_time);
 
         if (!tbl->kmem_cachep)
-                tbl->kmem_cachep = kmem_cache_create(tbl->id,
-                                                     tbl->entry_size,
-                                                     0, SLAB_HWCACHE_ALIGN,
-                                                     NULL, NULL);
-
-        if (!tbl->kmem_cachep)
-                panic("cannot create neighbour cache");
-
+                tbl->kmem_cachep =
+                        kmem_cache_create(tbl->id, tbl->entry_size, 0,
+                                          SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+                                          NULL, NULL);
         tbl->stats = alloc_percpu(struct neigh_statistics);
         if (!tbl->stats)
                 panic("cannot create neighbour cache statistics");
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 8a476f1956e5..c448c7f6fde2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2046,19 +2046,14 @@ void __init skb_init(void)
         skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
                                               sizeof(struct sk_buff),
                                               0,
-                                              SLAB_HWCACHE_ALIGN,
+                                              SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                               NULL, NULL);
-        if (!skbuff_head_cache)
-                panic("cannot create skbuff cache");
-
         skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
                                                 (2*sizeof(struct sk_buff)) +
                                                 sizeof(atomic_t),
                                                 0,
-                                                SLAB_HWCACHE_ALIGN,
+                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                 NULL, NULL);
-        if (!skbuff_fclone_cache)
-                panic("cannot create skbuff cache");
 }
 
 EXPORT_SYMBOL(___pskb_trim);
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index c5daf3557c1f..dd0761e3d280 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1781,14 +1781,9 @@ void __init dn_route_init(void)
 {
         int i, goal, order;
 
-        dn_dst_ops.kmem_cachep = kmem_cache_create("dn_dst_cache",
-                                                   sizeof(struct dn_route),
-                                                   0, SLAB_HWCACHE_ALIGN,
-                                                   NULL, NULL);
-
-        if (!dn_dst_ops.kmem_cachep)
-                panic("DECnet: Failed to allocate dn_dst_cache\n");
-
+        dn_dst_ops.kmem_cachep =
+                kmem_cache_create("dn_dst_cache", sizeof(struct dn_route), 0,
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
         init_timer(&dn_route_timer);
         dn_route_timer.function = dn_dst_check_expire;
         dn_route_timer.expires = jiffies + decnet_dst_gc_interval * HZ;
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index 03ff62ebcfeb..a675602ef295 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -126,12 +126,9 @@ void __init inet_initpeers(void)
 
         peer_cachep = kmem_cache_create("inet_peer_cache",
                         sizeof(struct inet_peer),
-                        0, SLAB_HWCACHE_ALIGN,
+                        0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                         NULL, NULL);
 
-        if (!peer_cachep)
-                panic("cannot create inet_peer_cache");
-
         /* All the timers, started at system startup tend
            to synchronize. Perturb it a bit.
          */
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 98f0aa0d4216..ba49588da242 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1900,11 +1900,8 @@ void __init ip_mr_init(void)
 {
         mrt_cachep = kmem_cache_create("ip_mrt_cache",
                                        sizeof(struct mfc_cache),
-                                       0, SLAB_HWCACHE_ALIGN,
+                                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                        NULL, NULL);
-        if (!mrt_cachep)
-                panic("cannot allocate ip_mrt_cache");
-
         init_timer(&ipmr_expire_timer);
         ipmr_expire_timer.function=ipmr_expire_process;
         register_netdevice_notifier(&ip_mr_notifier);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a4d4cb85a16c..20ffe8e88c0f 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -3147,13 +3147,9 @@ int __init ip_rt_init(void)
         }
 #endif
 
-        ipv4_dst_ops.kmem_cachep = kmem_cache_create("ip_dst_cache",
-                                                     sizeof(struct rtable),
-                                                     0, SLAB_HWCACHE_ALIGN,
-                                                     NULL, NULL);
-
-        if (!ipv4_dst_ops.kmem_cachep)
-                panic("IP: failed to allocate ip_dst_cache\n");
+        ipv4_dst_ops.kmem_cachep =
+                kmem_cache_create("ip_dst_cache", sizeof(struct rtable), 0,
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
 
         rt_hash_table = (struct rt_hash_bucket *)
                 alloc_large_system_hash("IP route cache",
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e570db4d33c8..29e3d606db78 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2254,9 +2254,7 @@ void __init tcp_init(void)
         tcp_hashinfo.bind_bucket_cachep =
                 kmem_cache_create("tcp_bind_bucket",
                                   sizeof(struct inet_bind_bucket), 0,
-                                  SLAB_HWCACHE_ALIGN, NULL, NULL);
-        if (!tcp_hashinfo.bind_bucket_cachep)
-                panic("tcp_init: Cannot alloc tcp_bind_bucket cache.");
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
 
         /* Size and allocate the main established and bind bucket
          * hash tables.
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index fbca60950b14..8fcae7a6510b 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1472,10 +1472,8 @@ void __init fib6_init(void)
 {
         fib6_node_kmem = kmem_cache_create("fib6_nodes",
                                            sizeof(struct fib6_node),
-                                           0, SLAB_HWCACHE_ALIGN,
+                                           0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                            NULL, NULL);
-        if (!fib6_node_kmem)
-                panic("cannot create fib6_nodes cache");
 
         fib6_tables_init();
 }
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d83844d9499b..ba1b3d11865e 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2419,13 +2419,9 @@ void __init ip6_route_init(void)
 {
         struct proc_dir_entry *p;
 
-        ip6_dst_ops.kmem_cachep = kmem_cache_create("ip6_dst_cache",
-                                                     sizeof(struct rt6_info),
-                                                     0, SLAB_HWCACHE_ALIGN,
-                                                     NULL, NULL);
-        if (!ip6_dst_ops.kmem_cachep)
-                panic("cannot create ip6_dst_cache");
-
+        ip6_dst_ops.kmem_cachep =
+                kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
+                                  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL);
         fib6_init();
 #ifdef  CONFIG_PROC_FS
         p = proc_net_create("ipv6_route", 0, rt6_proc_info);
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 891a6090cc09..dfc90bb1cf1f 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -82,8 +82,6 @@ void __init xfrm_input_init(void)
 {
         secpath_cachep = kmem_cache_create("secpath_cache",
                                            sizeof(struct sec_path),
-                                           0, SLAB_HWCACHE_ALIGN,
+                                           0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                            NULL, NULL);
-        if (!secpath_cachep)
-                panic("XFRM: failed to allocate secpath_cache\n");
 }
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 1cf3209cdf4b..7db1c48537f0 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1985,10 +1985,8 @@ static void __init xfrm_policy_init(void)
 
         xfrm_dst_cache = kmem_cache_create("xfrm_dst_cache",
                                            sizeof(struct xfrm_dst),
-                                           0, SLAB_HWCACHE_ALIGN,
+                                           0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                            NULL, NULL);
-        if (!xfrm_dst_cache)
-                panic("XFRM: failed to allocate xfrm_dst_cache\n");
 
         hmask = 8 - 1;
         sz = (hmask+1) * sizeof(struct hlist_head);