Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4d391d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent dae0c332

arch/m68k/include/asm/io_no.h

+0 −11
Original line number Diff line number Diff line
@@ -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>

arch/m68k/include/asm/kmap.h

+3 −0
Original line number Diff line number Diff line
@@ -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)

{