Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[thirdparty/kernel/stable.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index a06bb7a2a689b63275994034e47e452c11c4acff..b5baeb9cb0fb1bff2fb7c49c0a850bc493f7e58d 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -379,7 +379,7 @@ int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 
        current->flags |= PF_MEMALLOC;
        ret = sk->sk_backlog_rcv(sk, skb);
-       tsk_restore_flags(current, pflags, PF_MEMALLOC);
+       current_restore_flags(pflags, PF_MEMALLOC);
 
        return ret;
 }