From 7b89d52c201d579f618e7476e442e58264671b86 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Wed, 26 Nov 2008 03:57:44 -0800
Subject: [PATCH] --- yaml --- r: 119624 b: refs/heads/master c:
 3ec192559033ed457f0d7856838654c100fc659f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4bd8f4d08d16..c4be3fb7dd47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd51126957eeac96d056c670545ff798c89f63f5
+refs/heads/master: 3ec192559033ed457f0d7856838654c100fc659f
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
index 3b009a3e8549..5f4a6516b3b6 100644
--- a/trunk/net/netfilter/nf_conntrack_netlink.c
+++ b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -1138,7 +1138,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
 		}
 	}
 
-	nf_ct_acct_ext_add(ct, GFP_KERNEL);
+	nf_ct_acct_ext_add(ct, GFP_ATOMIC);
 
 #if defined(CONFIG_NF_CONNTRACK_MARK)
 	if (cda[CTA_MARK])