Merge branch 'akpm-current/current'

[karo-tx-linux.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index aeed5c95f3caedcdb4c10668c67764d8557e9369..59a71965b47682edadc1b37b69d112c8b347a95a 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2054,7 +2054,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 &current->task_frag;
 
        return &sk->sk_frag;