From cbea1257e450f6a1dde440160e85c399db69d2fc Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 4 Oct 2005 22:42:42 -0700
Subject: [PATCH] --- yaml --- r: 9665 b: refs/heads/master c:
 c6f4fafccfa66f0530587ac3c11bb8fd0b8fe8ab h: refs/heads/master i:   9663:
 da7b33b89e7fce93b2da9d7db1dfba91c586d967 v: v3

---
 [refs]                          | 2 +-
 trunk/net/netfilter/nfnetlink.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d54232a8464..909d855dcd27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8eea00a44d9f493869f8d30b72e3ed18475be556
+refs/heads/master: c6f4fafccfa66f0530587ac3c11bb8fd0b8fe8ab
diff --git a/trunk/net/netfilter/nfnetlink.c b/trunk/net/netfilter/nfnetlink.c
index 49a3900e3d32..34d671974a4d 100644
--- a/trunk/net/netfilter/nfnetlink.c
+++ b/trunk/net/netfilter/nfnetlink.c
@@ -195,7 +195,8 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys,
 
 int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, int echo)
 {
-	int allocation = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
+	unsigned int __nocast allocation =
+			in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
 	int err = 0;
 
 	NETLINK_CB(skb).dst_group = group;