summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/io_no.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@linux-m68k.org>2018-03-25 22:17:38 +1000
committerGreg Ungerer <gerg@linux-m68k.org>2018-05-28 09:45:26 +1000
commit9746882f547d2f00d2e761b418ae690cd406c8e2 (patch)
tree0725af19adb03a2d9743b5f0b8bfe5d202265655 /arch/m68k/include/asm/io_no.h
parent4478048b4485285353cc095a47683d2a86509c7d (diff)
m68k: group io mapping definitions and functions
Create a new header file, kmap.h, that groups all the definitions and functions associated with the io mapping and remapping. Currently the functions are spread across raw_io.h and io_mm.h. And in the future we will want to use these in io_no.h as well. So it makes sense to move them all together into a single header file. It is named after the arch/m68k/mm/kmap.c file that actually implements many of the exported functions. Signed-off-by: Greg Ungerer <gerg@linux-m68k.org> Tested-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'arch/m68k/include/asm/io_no.h')
-rw-r--r--arch/m68k/include/asm/io_no.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index 5095693e46ce..e9c70f754e02 100644
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h
@@ -25,6 +25,18 @@
#define writew __raw_writew
#define writel __raw_writel
+/*
+ * 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>