OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
94a098d
)
NFC: Atomic socket allocation
author
Samuel Ortiz
<sameo@linux.intel.com>
Wed, 14 Dec 2011 15:43:08 +0000
(16:43 +0100)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 14 Dec 2011 19:50:12 +0000
(14:50 -0500)
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
patch
|
blob
|
history
diff --git
a/net/nfc/rawsock.c
b/net/nfc/rawsock.c
index
11ac0a1
..
2e2f8c6
100644
(file)
--- a/
net/nfc/rawsock.c
+++ b/
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;