]> git.baikalelectronics.ru Git - kernel.git/commit
net: hisilicon: rename CACHE_LINE_MASK to avoid redefinition
authorRandy Dunlap <rdunlap@infradead.org>
Sun, 18 Jul 2021 20:38:34 +0000 (13:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Jul 2021 17:02:12 +0000 (10:02 -0700)
commitb16f3299ae1aa3c327e1fb742d0379ae4d6e86f2
tree02266efe23334a160940e6c82a5fb4a80ddbcd7f
parent1dd271d9e55296579e5ff7490346bcb2d7e03db8
net: hisilicon: rename CACHE_LINE_MASK to avoid redefinition

Building on ARCH=arc causes a "redefined" warning, so rename this
driver's CACHE_LINE_MASK to avoid the warning.

../drivers/net/ethernet/hisilicon/hip04_eth.c:134: warning: "CACHE_LINE_MASK" redefined
  134 | #define CACHE_LINE_MASK   0x3F
In file included from ../include/linux/cache.h:6,
                 from ../include/linux/printk.h:9,
                 from ../include/linux/kernel.h:19,
                 from ../include/linux/list.h:9,
                 from ../include/linux/module.h:12,
                 from ../drivers/net/ethernet/hisilicon/hip04_eth.c:7:
../arch/arc/include/asm/cache.h:17: note: this is the location of the previous definition
   17 | #define CACHE_LINE_MASK  (~(L1_CACHE_BYTES - 1))

Fixes: d413779cdd93 ("net: hisilicon: Add an tx_desc to adapt HI13X1_GMAC")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hip04_eth.c