summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller2015-08-28 06:45:31 +0200
committerDavid S. Miller2015-08-28 06:45:31 +0200
commit0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch)
treef502caf5555591ee237e14e5fa96b2c005a85036 /net/core
parentMerge branch 'iff_no_queue_fixups' (diff)
parentMerge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff)
downloadkernel-qcow2-linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.gz
kernel-qcow2-linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.xz
kernel-qcow2-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.c2
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;