diff options
author | David S. Miller <davem@davemloft.net> | 2015-08-28 06:45:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-28 06:45:31 +0200 |
commit | 0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch) | |
tree | f502caf5555591ee237e14e5fa96b2c005a85036 /net/core | |
parent | Merge branch 'iff_no_queue_fixups' (diff) | |
parent | Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
download | linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.xz linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 8a725cc50a90..dad4dd37e2aa 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -340,7 +340,7 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size) if (skb && frag_size) { skb->head_frag = 1; - if (virt_to_head_page(data)->pfmemalloc) + if (page_is_pfmemalloc(virt_to_head_page(data))) skb->pfmemalloc = 1; } return skb; |