commit db81a62451b24eaef59f41e6fb312a88e1a83454
author Samuel Ortiz <sameo@linux.intel.com> Wed Dec 14 16:43:08 2011 +0100
committer John W. Linville <linville@tuxdriver.com> Wed Dec 14 14:50:12 2011 -0500
tree 7d2f730daacb982db12a866d89bc119cc103d33c
parent 94a098da42f258ae7019acbbea3bc5f93dc6f8f1

NFC: Atomic socket allocation

rawsock_create() is called with preemption disabled, so we should not
sleep.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/nfc/rawsock.c

diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 11ac0a1..2e2f8c6 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -310,7 +310,7 @@
 
 	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;