From f2a7a4f811ebf216c0f74aac250872e2f12c929c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 17 Nov 2005 16:52:51 -0800
Subject: [PATCH] --- yaml --- r: 14376 b: refs/heads/master c:
 9e147a1cfce5ec6308b024abe425d5b4e1884a03 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 553ad5511b31..f1fa4107be3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05b8b0fafd4cac75d205ecd5ad40992e2cc5934d
+refs/heads/master: 9e147a1cfce5ec6308b024abe425d5b4e1884a03
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 9a71a8d1078a..a7a537b50595 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1732,7 +1732,7 @@ int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 		/*
 		 * 2. allocate and initialize walker.
 		 */
-		w = kmalloc(sizeof(*w), GFP_KERNEL);
+		w = kmalloc(sizeof(*w), GFP_ATOMIC);
 		if (w == NULL)
 			return -ENOMEM;
 		RT6_TRACE("dump<%p", w);