summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@linux-m68k.org>2018-03-22 01:36:41 +0100
committerGreg Ungerer <gerg@linux-m68k.org>2018-05-28 01:45:25 +0200
commitf8f3304856cdf67414ba2c1a3d2adf78974a3d6a (patch)
treee6549cf8e348146f04a8c8f6fc3810b7a6931034 /arch
parentm68k: move *_relaxed macros into io_no.h and io_mm.h (diff)
downloadlinux-f8f3304856cdf67414ba2c1a3d2adf78974a3d6a.tar.xz
linux-f8f3304856cdf67414ba2c1a3d2adf78974a3d6a.zip
m68k: put definition guards around virt_to_phys and phys_to_virt
The non-MMU and ColdFire IO access functions will be moving to using the asm-generic/io.h in the near future. To make that possible we need define guards around the m68k specific virt_to_phys() and phys_to_virt() functions. Signed-off-by: Greg Ungerer <gerg@linux-m68k.org> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Angelo Dureghello <angelo@sysam.it> Tested-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68k/include/asm/virtconvert.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/virtconvert.h b/arch/m68k/include/asm/virtconvert.h
index 4aea6be7b220..dfe43083b579 100644
--- a/arch/m68k/include/asm/virtconvert.h
+++ b/arch/m68k/include/asm/virtconvert.h
@@ -16,11 +16,13 @@
/*
* Change virtual addresses to physical addresses and vv.
*/
+#define virt_to_phys virt_to_phys
static inline unsigned long virt_to_phys(void *address)
{
return __pa(address);
}
+#define phys_to_virt phys_to_virt
static inline void *phys_to_virt(unsigned long address)
{
return __va(address);