aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/kmap.h
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2018-06-28 10:54:35 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2018-07-29 10:48:18 +0200
commitab4d391d2756086e34568f0ff84bc4fc7596e685 (patch)
tree92bf033b6a2fa16592b3c5fb4f723f4ddf29a171 /arch/m68k/include/asm/kmap.h
parentInput: hilkbd - Add casts to HP9000/300 I/O accessors (diff)
downloadlinux-dev-ab4d391d2756086e34568f0ff84bc4fc7596e685.tar.xz
linux-dev-ab4d391d2756086e34568f0ff84bc4fc7596e685.zip
m68k/io: Move mem*io define guards to <asm/kmap.h>
The mem*io define guards are applicable to all users of <asm/kmap.h>. Hence move them, and drop the #ifdef. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/kmap.h')
-rw-r--r--arch/m68k/include/asm/kmap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h
index 608e12f058a7..aac7f045f7f0 100644
--- a/arch/m68k/include/asm/kmap.h
+++ b/arch/m68k/include/asm/kmap.h
@@ -50,18 +50,21 @@ static inline void __iomem *ioremap_fullcache(unsigned long physaddr,
return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
}
+#define memset_io memset_io
static inline void memset_io(volatile void __iomem *addr, unsigned char val,
int count)
{
__builtin_memset((void __force *) addr, val, count);
}
+#define memcpy_fromio memcpy_fromio
static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
int count)
{
__builtin_memcpy(dst, (void __force *) src, count);
}
+#define memcpy_toio memcpy_toio
static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
int count)
{