diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-11-22 15:21:22 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-11-22 10:08:40 -0500 |
commit | 06b37b650cf826349677564cb0ff1560ed8e51fc (patch) | |
tree | 37e3b5633378bf7e408806eb6094bcb097a2a643 | |
parent | 41f698b0f5fdaeff7dd76c3b218cf4da3c8ef70b (diff) | |
download | linux-stable-06b37b650cf826349677564cb0ff1560ed8e51fc.tar.gz linux-stable-06b37b650cf826349677564cb0ff1560ed8e51fc.tar.bz2 linux-stable-06b37b650cf826349677564cb0ff1560ed8e51fc.zip |
marvell: mark mvneta and mvpp2 32-bit only
Both of these drivers won't work on 64-bit architectures unless they
are redesigned, since they store a virtual address pointer in a 32-bit
field of the descriptors:
drivers/net/ethernet/marvell/mvneta_bm.c: In function 'mvneta_bm_construct':
drivers/net/ethernet/marvell/mvneta_bm.c:103:16: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
drivers/net/ethernet/marvell/mvpp2.c: In function 'mvpp2_prs_vlan_init':
drivers/net/ethernet/marvell/mvpp2.c:2563:32: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
This limits the COMPILE_TEST option for the two drivers again to
only build them on 32-bit. This seems nicer than shutting up the
warnings, in case we ever actually want to use them on 64-bit,
as the warnings indicate which parts of the driver are currently
broken there.
Fixes: a0627f776a45 ("net: marvell: Allow drivers to be built with COMPILE_TEST")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/marvell/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/Kconfig b/drivers/net/ethernet/marvell/Kconfig index d74d4e6f0b34..66fd9dbb2ca7 100644 --- a/drivers/net/ethernet/marvell/Kconfig +++ b/drivers/net/ethernet/marvell/Kconfig @@ -58,6 +58,7 @@ config MVNETA tristate "Marvell Armada 370/38x/XP network interface support" depends on PLAT_ORION || COMPILE_TEST depends on HAS_DMA + depends on !64BIT select MVMDIO select FIXED_PHY ---help--- @@ -81,6 +82,7 @@ config MVPP2 tristate "Marvell Armada 375 network interface support" depends on MACH_ARMADA_375 || COMPILE_TEST depends on HAS_DMA + depends on !64BIT select MVMDIO ---help--- This driver supports the network interface units in the |