From af6b3587c516d0ad87cfc38ad30261ee7ce9597a Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Sat, 12 Nov 2005 12:15:16 -0800
Subject: [PATCH] --- yaml --- r: 14010 b: refs/heads/master c:
 8225ccbaf01b459cf1e462047a51b2851e756bc1 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 a7432d38c05b..97abe6254177 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d7222f0f5861ce13b9308c30bd18f28ebeb583
+refs/heads/master: 8225ccbaf01b459cf1e462047a51b2851e756bc1
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index a7a537b50595..9a71a8d1078a 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_ATOMIC);
+		w = kmalloc(sizeof(*w), GFP_KERNEL);
 		if (w == NULL)
 			return -ENOMEM;
 		RT6_TRACE("dump<%p", w);