From d1cc1864cc1595e00f1a1f0c942485f58d09fc88 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue, 3 Apr 2012 12:32:15 +0200
Subject: [PATCH] --- yaml --- r: 298756 b: refs/heads/master c:
 ca53e4405347a1e19eaf59c757ceaaaa1a784758 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 32d1f97915be..a15f58936d9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b461783d3d49c74665b55b8ae1b7a1c038177a9
+refs/heads/master: ca53e4405347a1e19eaf59c757ceaaaa1a784758
diff --git a/trunk/net/netfilter/xt_CT.c b/trunk/net/netfilter/xt_CT.c
index 138b75e41fdd..4babb278e41e 100644
--- a/trunk/net/netfilter/xt_CT.c
+++ b/trunk/net/netfilter/xt_CT.c
@@ -261,7 +261,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par)
 				goto err4;
 			}
 			timeout_ext = nf_ct_timeout_ext_add(ct, timeout,
-							    GFP_KERNEL);
+							    GFP_ATOMIC);
 			if (timeout_ext == NULL) {
 				ret = -ENOMEM;
 				goto err4;