projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag '4.4-additional' of git://git.lwn.net/linux
[cascardo/linux.git]
/
include
/
net
/
sock.h
diff --git
a/include/net/sock.h
b/include/net/sock.h
index
f570e75
..
bbf7c2c
100644
(file)
--- a/
include/net/sock.h
+++ b/
include/net/sock.h
@@
-2041,7
+2041,7
@@
struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp,
*/
static inline struct page_frag *sk_page_frag(struct sock *sk)
{
- if (
sk->sk_allocation & __GFP_WAIT
)
+ if (
gfpflags_allow_blocking(sk->sk_allocation)
)
return ¤t->task_frag;
return &sk->sk_frag;