Merge branch 'linus' into locking/core, to resolve conflicts

[linux.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_main.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6d5f31e943583df77f5fa1e6aa3e2703fff33518..935a2f15b0b00e72763214aad0248a504f5b3a45 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -380,7 +380,7 @@ static void ixgbe_check_remove(struct ixgbe_hw *hw, u32 reg)
  */
 u32 ixgbe_read_reg(struct ixgbe_hw *hw, u32 reg)
 {
-       u8 __iomem *reg_addr = ACCESS_ONCE(hw->hw_addr);
+       u8 __iomem *reg_addr = READ_ONCE(hw->hw_addr);
        u32 value;
 
        if (ixgbe_removed(reg_addr))
@@ -8624,7 +8624,7 @@ static void ixgbe_get_stats64(struct net_device *netdev,
 
        rcu_read_lock();
        for (i = 0; i < adapter->num_rx_queues; i++) {
-               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->rx_ring[i]);
+               struct ixgbe_ring *ring = READ_ONCE(adapter->rx_ring[i]);
                u64 bytes, packets;
                unsigned int start;
 
@@ -8640,12 +8640,12 @@ static void ixgbe_get_stats64(struct net_device *netdev,
        }
 
        for (i = 0; i < adapter->num_tx_queues; i++) {
-               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->tx_ring[i]);
+               struct ixgbe_ring *ring = READ_ONCE(adapter->tx_ring[i]);
 
                ixgbe_get_ring_stats64(stats, ring);
        }
        for (i = 0; i < adapter->num_xdp_queues; i++) {
-               struct ixgbe_ring *ring = ACCESS_ONCE(adapter->xdp_ring[i]);
+               struct ixgbe_ring *ring = READ_ONCE(adapter->xdp_ring[i]);
 
                ixgbe_get_ring_stats64(stats, ring);
        }