From b9a2b79952ef78e4cfce8c28369c44f79ce7c6dd Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 14 Dec 2011 16:43:08 +0100
Subject: [PATCH] --- yaml --- r: 278962 b: refs/heads/master c:
 db81a62451b24eaef59f41e6fb312a88e1a83454 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a6ff1394be52..3d7781534377 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94a098da42f258ae7019acbbea3bc5f93dc6f8f1
+refs/heads/master: db81a62451b24eaef59f41e6fb312a88e1a83454
diff --git a/trunk/net/nfc/rawsock.c b/trunk/net/nfc/rawsock.c
index 11ac0a17156e..2e2f8c6a61fe 100644
--- a/trunk/net/nfc/rawsock.c
+++ b/trunk/net/nfc/rawsock.c
@@ -310,7 +310,7 @@ static int rawsock_create(struct net *net, struct socket *sock,
 
 	sock->ops = &rawsock_ops;
 
-	sk = sk_alloc(net, PF_NFC, GFP_KERNEL, nfc_proto->proto);
+	sk = sk_alloc(net, PF_NFC, GFP_ATOMIC, nfc_proto->proto);
 	if (!sk)
 		return -ENOMEM;