From bb259b3bd1971d25173b81b5005f29cad8e5d7bc Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Fri, 7 Dec 2007 00:45:16 -0800
Subject: [PATCH] --- yaml --- r: 78361 b: refs/heads/master c:
 f845ab6b7dd872d027c27146c264e46bc16c656a h: refs/heads/master i:   78359:
 5be8fa09e823902fe33e46679bfdf9c304dde939 v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv6/ip6_fib.c | 5 ++++-
 trunk/net/ipv6/route.c   | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa36526029fa..16fcf39035a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2fddf5e96df4ac26f2e9ce63053d51cdf3cfe1e
+refs/heads/master: f845ab6b7dd872d027c27146c264e46bc16c656a
diff --git a/trunk/net/ipv6/ip6_fib.c b/trunk/net/ipv6/ip6_fib.c
index c100b44f2b87..5fae04506ad9 100644
--- a/trunk/net/ipv6/ip6_fib.c
+++ b/trunk/net/ipv6/ip6_fib.c
@@ -1478,8 +1478,11 @@ int __init fib6_init(void)
 	int ret;
 	fib6_node_kmem = kmem_cache_create("fib6_nodes",
 					   sizeof(struct fib6_node),
-					   0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+					   0, SLAB_HWCACHE_ALIGN,
 					   NULL);
+	if (!fib6_node_kmem)
+		return -ENOMEM;
+
 	fib6_tables_init();
 
 	ret = __rtnl_register(PF_INET6, RTM_GETROUTE, NULL, inet6_dump_fib);
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index d7754abf9216..6f833cacfcfb 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -2474,7 +2474,10 @@ int __init ip6_route_init(void)
 
 	ip6_dst_ops.kmem_cachep =
 		kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0,
-				  SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
+				  SLAB_HWCACHE_ALIGN, NULL);
+	if (!ip6_dst_ops.kmem_cachep)
+		return -ENOMEM;
+
 	ip6_dst_blackhole_ops.kmem_cachep = ip6_dst_ops.kmem_cachep;
 
 	ret = fib6_init();