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/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -748,7 +748,7 @@ static void ixgbevf_reuse_rx_page(struct ixgbevf_ring *rx_ring,

 static inline bool ixgbevf_page_is_reserved(struct page *page)
 {
-	return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
+	return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
 }

 /**