m68k: Provide __phys_to_pfn() and __pfn_to_phys()
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Tue, 5 Jan 2016 23:48:54 +0000 (10:48 +1100)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 10 Jan 2016 12:56:40 +0000 (13:56 +0100)
The defconfig build of m68k was failing with the error:
implicit declaration of function '__pfn_to_phys'

Other architectures have added <asm/memory.h>, but if we do so here then
we will also get redeclaration of some other functions. So it is better
to copy these macros into page.h.

Fixes: 0a3c3bf11240 ("x86, mm: introduce vmem_altmap to augment vmemmap_populate()")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Reported-by: Guenter Roeck <linux@roeck-us.net> (m68knommu)
[geert: Apply to page.h instead of page_mm.h to cover nommu, reword]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
arch/m68k/include/asm/page.h

index 38b024a0b0451ba7a934ea5d4f5563411d406b6d..430d4d54c88383a9620e053c356a71b8cde92e63 100644 (file)
@@ -48,6 +48,9 @@ extern unsigned long _ramend;
 #include <asm/page_no.h>
 #endif
 
+#define __phys_to_pfn(paddr)   ((unsigned long)((paddr) >> PAGE_SHIFT))
+#define __pfn_to_phys(pfn)     PFN_PHYS(pfn)
+
 #define VM_DATA_DEFAULT_FLAGS  (VM_READ | VM_WRITE | VM_EXEC | \
                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)