From 5eb159590a4220961d1d290ff80e3c6f1aa7a4c0 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Thu, 4 Apr 2019 19:57:17 +0300 Subject: [PATCH] kernel: drivers: igb: use READ_ONCE instead of ACCESS_ONCE ACCESS_ONCE isn't available starting from kernel v4.15. Signed-off-by: Roman Stratiienko Signed-off-by: Jan Kiszka --- kernel/drivers/net/drivers/igb/e1000_regs.h | 2 +- kernel/drivers/net/drivers/igb/igb_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/drivers/net/drivers/igb/e1000_regs.h b/kernel/drivers/net/drivers/igb/e1000_regs.h index 30df9bad4..0d1d1406d 100644 --- a/kernel/drivers/net/drivers/igb/e1000_regs.h +++ b/kernel/drivers/net/drivers/igb/e1000_regs.h @@ -372,7 +372,7 @@ u32 igb_rd32(struct e1000_hw *hw, u32 reg); /* write operations, indexed using DWORDS */ #define wr32(reg, val) \ do { \ - u8 __iomem *hw_addr = ACCESS_ONCE((hw)->hw_addr); \ + u8 __iomem *hw_addr = READ_ONCE((hw)->hw_addr); \ if (!E1000_REMOVED(hw_addr)) \ writel((val), &hw_addr[(reg)]); \ } while (0) diff --git a/kernel/drivers/net/drivers/igb/igb_main.c b/kernel/drivers/net/drivers/igb/igb_main.c index c1d1000ea..093ff3480 100644 --- a/kernel/drivers/net/drivers/igb/igb_main.c +++ b/kernel/drivers/net/drivers/igb/igb_main.c @@ -654,7 +654,7 @@ static void igb_cache_ring_register(struct igb_adapter *adapter) u32 igb_rd32(struct e1000_hw *hw, u32 reg) { struct igb_adapter *igb = container_of(hw, struct igb_adapter, hw); - u8 __iomem *hw_addr = ACCESS_ONCE(hw->hw_addr); + u8 __iomem *hw_addr = READ_ONCE(hw->hw_addr); u32 value = 0; if (E1000_REMOVED(hw_addr)) -- GitLab