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

Two AF_* families adding entries to the lockdep tables
at the same time.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 7546109d4980..7fc95493b692 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3964,8 +3964,8 @@ static void igb_clean_rx_ring(struct igb_ring *rx_ring)
                                      PAGE_SIZE,
                                      DMA_FROM_DEVICE,
                                      DMA_ATTR_SKIP_CPU_SYNC);
-                __page_frag_drain(buffer_info->page, 0,
-                                  buffer_info->pagecnt_bias);
+                __page_frag_cache_drain(buffer_info->page,
+                                        buffer_info->pagecnt_bias);
 
                 buffer_info->page = NULL;
         }
@@ -6991,7 +6991,7 @@ static struct sk_buff *igb_fetch_rx_buffer(struct igb_ring *rx_ring,
                 dma_unmap_page_attrs(rx_ring->dev, rx_buffer->dma,
                                      PAGE_SIZE, DMA_FROM_DEVICE,
                                      DMA_ATTR_SKIP_CPU_SYNC);
-                __page_frag_drain(page, 0, rx_buffer->pagecnt_bias);
+                __page_frag_cache_drain(page, rx_buffer->pagecnt_bias);
         }
 
         /* clear contents of rx_buffer */