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

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

diff --git a/net/core/dev.c b/net/core/dev.c
index 0b2876e00834bf8c366288d60de3ae03ae1871b3..d07aa5ffb511e408b166624d424130c5105560ca 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4248,7 +4248,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
                 */
                current->flags |= PF_MEMALLOC;
                ret = __netif_receive_skb_core(skb, true);
-               tsk_restore_flags(current, pflags, PF_MEMALLOC);
+               current_restore_flags(pflags, PF_MEMALLOC);
        } else
                ret = __netif_receive_skb_core(skb, false);