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

2015-08-27 21:45:31 -07:00
parent 55f14da669 4941b8f0c2
commit 0d36938bb8
91 changed files with 509 additions and 867 deletions
--- 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;