From eb37bc3f85b69f529d2ad06c41fad8dedd654c76 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Wed, 6 Jan 2016 10:48:54 +1100 Subject: m68k: Provide __phys_to_pfn() and __pfn_to_phys() The defconfig build of m68k was failing with the error: implicit declaration of function '__pfn_to_phys' Other architectures have added , 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 Cc: Dan Williams Reported-by: Guenter Roeck (m68knommu) [geert: Apply to page.h instead of page_mm.h to cover nommu, reword] Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/page.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'arch/m68k/include/asm/page.h') diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h index 38b024a0b045..430d4d54c883 100644 --- a/arch/m68k/include/asm/page.h +++ b/arch/m68k/include/asm/page.h @@ -48,6 +48,9 @@ extern unsigned long _ramend; #include #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) -- cgit