diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-06-28 11:54:35 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-07-29 11:48:18 +0300 |
| commit | ab4d391d2756086e34568f0ff84bc4fc7596e685 (patch) | |
| tree | 92bf033b6a2fa16592b3c5fb4f723f4ddf29a171 /arch | |
| parent | dae0c332b6b37bdb6eeed9df6fa168b10def8acc (diff) | |
| download | linux-ab4d391d2756086e34568f0ff84bc4fc7596e685.tar.xz | |
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')
| -rw-r--r-- | arch/m68k/include/asm/io_no.h | 11 | ||||
| -rw-r--r-- | arch/m68k/include/asm/kmap.h | 3 |
2 files changed, 3 insertions, 11 deletions
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 83a0a6d449f4..c207428fae59 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h @@ -131,17 +131,6 @@ static inline void writel(u32 value, volatile void __iomem *addr) #define PCI_SPACE_LIMIT PCI_IO_MASK #endif /* CONFIG_PCI */ -/* - * These are defined in kmap.h as static inline functions. To maintain - * previous behavior we put these define guards here so io_mm.h doesn't - * see them. - */ -#ifdef CONFIG_MMU -#define memset_io memset_io -#define memcpy_fromio memcpy_fromio -#define memcpy_toio memcpy_toio -#endif - #include <asm/kmap.h> #include <asm/virtconvert.h> #include <asm-generic/io.h> 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) { |