summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/core_marvel.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-10-03 13:12:54 +0200
committerArnd Bergmann <arnd@arndb.de>2022-10-04 11:23:29 +0200
commite19d4ebc536dadb607fe305fdaf48218d3e32d7c (patch)
tree5d645d629d6675015352a1a00d560f55efc6272d /arch/alpha/kernel/core_marvel.c
parent28a679ea60d0d16c3556f687bb2040559e92e932 (diff)
downloadlinux-e19d4ebc536dadb607fe305fdaf48218d3e32d7c.tar.bz2
alpha: add full ioread64/iowrite64 implementation
The previous patch introduced ioread64/iowrite64 declarations, but this means we no longer get the io-64-nonatomic variant, and run into a long error when someone actually wants to use these: ERROR: modpost: "ioread64" [drivers/net/ethernet/freescale/enetc/fsl-enetc.ko] undefined! Add the (hopefully) correct implementation for each machine type, based on the 32-bit accessor. Since the 32-bit return type does not work for ioread64(), change the internal implementation to use the correct width consistently, but leave the external interface to match the asm-generic/iomap.h header that uses 32-bit or 64-bit return values. Reported-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Fixes: 7e772dad9913 ("alpha: Use generic <asm-generic/io.h>") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/alpha/kernel/core_marvel.c')
-rw-r--r--arch/alpha/kernel/core_marvel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 1efca79ac83c..6d0b3baf97ff 100644
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -803,7 +803,7 @@ void __iomem *marvel_ioportmap (unsigned long addr)
return (void __iomem *)addr;
}
-unsigned int
+unsigned u8
marvel_ioread8(const void __iomem *xaddr)
{
unsigned long addr = (unsigned long) xaddr;