Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -11
-11
arch/m68k/include/asm/io_no.h
··· 131 131 #define PCI_SPACE_LIMIT PCI_IO_MASK 132 132 #endif /* CONFIG_PCI */ 133 133 134 - /* 135 - * These are defined in kmap.h as static inline functions. To maintain 136 - * previous behavior we put these define guards here so io_mm.h doesn't 137 - * see them. 138 - */ 139 - #ifdef CONFIG_MMU 140 - #define memset_io memset_io 141 - #define memcpy_fromio memcpy_fromio 142 - #define memcpy_toio memcpy_toio 143 - #endif 144 - 145 134 #include <asm/kmap.h> 146 135 #include <asm/virtconvert.h> 147 136 #include <asm-generic/io.h>
+3
arch/m68k/include/asm/kmap.h
··· 50 50 return __ioremap(physaddr, size, IOMAP_FULL_CACHING); 51 51 } 52 52 53 + #define memset_io memset_io 53 54 static inline void memset_io(volatile void __iomem *addr, unsigned char val, 54 55 int count) 55 56 { 56 57 __builtin_memset((void __force *) addr, val, count); 57 58 } 58 59 60 + #define memcpy_fromio memcpy_fromio 59 61 static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, 60 62 int count) 61 63 { 62 64 __builtin_memcpy(dst, (void __force *) src, count); 63 65 } 64 66 67 + #define memcpy_toio memcpy_toio 65 68 static inline void memcpy_toio(volatile void __iomem *dst, const void *src, 66 69 int count) 67 70 {